diff --git a/jvm/core/src/main/scala/org/scalatest/Retries.scala b/jvm/core/src/main/scala/org/scalatest/Retries.scala index 2baef90889..0f485c34f9 100644 --- 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.