Merge pull request #2281 from scalatest/3.3-retries-fix

Merging this directly as it is already approved in 3.2 PR #2279
scalatest · Sep 21, 2023 · 783f4e5 · 783f4e5
2 parents c27c76d + e8b96dd
commit 783f4e5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/jvm/core/src/main/scala/org/scalatest/Retries.scala b/jvm/core/src/main/scala/org/scalatest/Retries.scala
@@ -15,8 +15,6 @@
  */
 package org.scalatest
 
-import org.scalatest.concurrent.SleepHelper
-import org.scalatest.concurrent.SleepHelper
 import org.scalatest.concurrent.SleepHelper
 import time.Span
 
@@ -345,11 +343,15 @@ trait Retries {
     val firstOutcome = blk
     firstOutcome match {
       case Failed(ex) =>
+        if (delay != Span.Zero)
+          SleepHelper.sleep(delay.millisPart, delay.nanosPart)
         blk match {
           case Succeeded => Canceled(Resources.testFlickered, ex)
           case other => firstOutcome
         }
       case Canceled(ex) =>
+        if (delay != Span.Zero)
+          SleepHelper.sleep(delay.millisPart, delay.nanosPart)
         blk match {
           case Succeeded => Succeeded
           case failed: Failed => failed // Never hide a failure.
@@ -567,7 +569,7 @@ trait Retries {
     firstOutcome match {
       case Failed(ex) =>
         if (delay != Span.Zero)
-          SleepHelper.sleep(delay.millisPart)
+          SleepHelper.sleep(delay.millisPart, delay.nanosPart)
         blk match {
           case Succeeded => Canceled(Resources.testFlickered, ex)
           case other => firstOutcome
@@ -782,8 +784,7 @@ trait Retries {
     firstOutcome match {
       case Canceled(ex) =>
         if (delay != Span.Zero)
-          SleepHelper.sleep(delay.millisPart)
-        SleepHelper.sleep(delay.millisPart)
+          SleepHelper.sleep(delay.millisPart, delay.nanosPart)
         blk match {
           case Succeeded => Succeeded
           case failed: Failed => failed // Never hide a failure.