Why didn't the submodule check catch this? (#900)

Co-authored-by: Bret Ambrose <bambrose@amazon.com>
Co-authored-by: Igor Abdrakhimov <octosyllabic@gmail.com>

Author: 3 people

src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java

@@ -1207,7 +1207,7 @@ private void doConnNegativeID_UC7Test() {
                 clientOne.start();
                 eventsOne.connectedFuture.get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
 
-                Thread.sleep(2000); // Sleep for 2 seconds to not hit IoT Core limits
+                TestUtils.sleepForAtLeastMilliseconds(2000); // Sleep for 2 seconds to not hit IoT Core limits
 
                 clientTwo.start();
                 eventsTwo.connectedFuture.get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
@@ -1732,7 +1732,7 @@ private void doNegotiated_Rejoin_AlwaysTest() {
             }
 
             /* Avoid accidentally triggering re-connect throttle */
-            Thread.sleep(2000);
+            TestUtils.sleepForAtLeastMilliseconds(2000);
 
             builder.withSessionBehavior(ClientSessionBehavior.REJOIN_ALWAYS);
             LifecycleEvents_Futured rejoinEvents = new LifecycleEvents_Futured();
@@ -1990,7 +1990,7 @@ private void doOp_UC4Test() {
                 subscriber.subscribe(subscribePacketBuilder.build()).get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
 
                 // Paranoid about service-side eventual consistency.  Add a wait to reduce chances of a missed will publish.
-                Thread.sleep(2000);
+                TestUtils.sleepForAtLeastMilliseconds(2000);
 
                 publisher.stop(disconnectPacketBuilder.build());
 
@@ -2069,7 +2069,7 @@ private void doOp_SharedSubscriptionTest() {
                 subscriberOneClient.subscribe(subscribePacketBuilder.build()).get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
                 subscriberTwoClient.subscribe(subscribePacketBuilder.build()).get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
 
-                Thread.sleep(4000);
+                TestUtils.sleepForAtLeastMilliseconds(4000);
 
                 for (int i = 0; i < messageCount; ++i) {
                     publishPacketBuilder.withPayload(String.valueOf(i).getBytes());
@@ -2457,7 +2457,7 @@ private void doRetain_UC1Test() {
                 publisher.publish(publishPacketBuilder.build()).get(OPERATION_TIMEOUT_TIME, TimeUnit.SECONDS);
 
                 // Wait 15 seconds to give the server time to clear everything out
-                Thread.sleep(15000);
+                TestUtils.sleepForAtLeastMilliseconds(15000);
 
                 // Connect the unsuccessful subscriber
                 unsuccessfulSubscriber.start();

src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTestFixture.java

@@ -134,7 +134,8 @@ public void onConnectionSuccess(Mqtt5Client client, OnConnectionSuccessReturn on
         public void onConnectionFailure(Mqtt5Client client, OnConnectionFailureReturn onConnectionFailureReturn) {
             connectFailureCode = onConnectionFailureReturn.getErrorCode();
             connectFailurePacket = onConnectionFailureReturn.getConnAckPacket();
-            connectedFuture.completeExceptionally(new Exception("Could not connect! Error name: " + CRT.awsErrorName(connectFailureCode)));
+            connectedFuture.completeExceptionally(new Exception("Could not connect! Error name: "
+                    + CRT.awsErrorName(connectFailureCode) + " (" + CRT.awsErrorString(connectFailureCode) + ")"));
         }
 
         @Override

src/test/java/software/amazon/awssdk/crt/test/MqttRequestResponseClientTests.java

@@ -203,7 +203,7 @@ static private MqttClientConnection createMqtt311Client() {
                         }
 
                         try {
-                            Thread.sleep(RETRY_DELAY_MILLIS);
+                            TestUtils.sleepForAtLeastMilliseconds(RETRY_DELAY_MILLIS);
                         } catch (Exception e) {
                             ; // don't care
                         }

src/test/java/software/amazon/awssdk/crt/test/TestUtils.java

@@ -24,14 +24,28 @@ static public void doRetryableTest(Runnable testFunction, Function<Exception, Bo
                 }
             }
 
-            Thread.sleep(sleepTimeMillis);
+            sleepForAtLeastMilliseconds(sleepTimeMillis);
         }
 
         throw new Exception("Retryable network test exceeded the maximum allowed attempts without succeeding");
     }
 
     static public Boolean isRetryableTimeout(Exception ex) {
         String exceptionMsg = ex.toString();
-        return exceptionMsg.contains("socket operation timed out") || exceptionMsg.contains("tls negotiation timeout");
+        return exceptionMsg.contains("socket operation timed out") ||
+                exceptionMsg.contains("tls negotiation timeout") ||
+                exceptionMsg.contains("socket connection refused");
+    }
+
+    static public void sleepForAtLeastMilliseconds(long sleepMilliseconds) throws InterruptedException {
+        long startTimeNanoseconds = System.nanoTime();
+        long sleepNanoseconds = sleepMilliseconds * 1_000_000L;
+        long remainingMilliseconds = sleepMilliseconds;
+
+        while (remainingMilliseconds > 0) {
+            Thread.sleep(remainingMilliseconds);
+            long elapsedNanoseconds = System.nanoTime() - startTimeNanoseconds;
+            remainingMilliseconds = (sleepNanoseconds - elapsedNanoseconds + 1) / 1_000_000L;
+        }
     }
 }