Fix race conditions in samples and service tests

samples/fleet_provisioning/fleet_provisioning/main.cpp

@@ -426,7 +426,7 @@ int main(int argc, char *argv[])
 {
     /************************ Setup ****************************/
 
-    //  Do the global initialization for the API
+    // Do the global initialization for the API
     ApiHandle apiHandle;
 
     /**

samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp

@@ -79,7 +79,7 @@ struct RegisterThingContext
 /**
  * Create MQTT5 client.
  */
-std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(Mqtt5ClientContext &ctx, const Utils::cmdData &cmdData)
+std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(const Utils::cmdData &cmdData, Mqtt5ClientContext &ctx)
 {
     // Create the MQTT5 builder and populate it with data from cmdData.
     Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
@@ -418,7 +418,7 @@ int main(int argc, char *argv[])
 {
     /************************ Setup ****************************/
 
-    //  Do the global initialization for the API
+    // Do the global initialization for the API
     ApiHandle apiHandle;
 
     /**
@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputFleetProvisioning(argc, argv, &apiHandle);
 
     Mqtt5ClientContext mqtt5ClientContext;
-    auto client = createMqtt5Client(mqtt5ClientContext, cmdData);
+    auto client = createMqtt5Client(cmdData, mqtt5ClientContext);
 
     /************************ Run the sample ****************************/
 

samples/secure_tunneling/secure_tunnel/main.cpp

@@ -133,6 +133,7 @@ int main(int argc, char *argv[])
      * In a real world application you probably don't want to enforce synchronous behavior
      * but this is a sample console application, so we'll just do that with a condition variable.
      */
+    std::promise<void> clientConnectedPromise;
     std::promise<bool> clientStoppedPromise;
 
     // service id storage for use in sample
@@ -285,6 +286,7 @@ int main(int argc, char *argv[])
                 fprintf(stdout, "Sending Stream Start request\n");
                 secureTunnel->SendStreamStart();
             }
+            clientConnectedPromise.set_value();
         }
     });
 
@@ -345,6 +347,8 @@ int main(int argc, char *argv[])
         exit(-1);
     }
 
+    clientConnectedPromise.get_future().wait_for(std::chrono::seconds(5));
+
     /*
      * In Destination mode the Secure Tunnel Client will remain open and echo messages that come in.
      * In Source mode the Secure Tunnel Client will send 4 messages and then disconnect and terminate.