Adjusted code in StepwiseNestedSuiteExecution to work with async test.

scalatest · Dec 6, 2022 · d36e102 · d36e102
1 parent bbbaf03
commit d36e102
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/jvm/core/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala b/jvm/core/src/main/scala/org/scalatest/StepwiseNestedSuiteExecution.scala
@@ -69,9 +69,18 @@ trait StepwiseNestedSuiteExecution extends SuiteMixin { thisSuite: Suite =>
           val rawString = Resources.suiteCompletedNormally
           val formatter = formatterForSuiteCompleted(nestedSuite)
 
-          val duration = System.currentTimeMillis - suiteStartTime
-          report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
-          SucceededStatus
+          distributor match {
+            case Some(_) => 
+              status.withAfterEffect {
+                val duration = System.currentTimeMillis - suiteStartTime
+                report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
+              }
+
+            case None => 
+              val duration = System.currentTimeMillis - suiteStartTime
+              report(SuiteCompleted(tracker.nextOrdinal(), nestedSuite.suiteName, nestedSuite.suiteId, Some(suiteClassName), Some(duration), formatter, Some(TopOfClass(nestedSuite.getClass.getName)), nestedSuite.rerunner))
+          }
+          status
         }
         catch {       
           case e: RuntimeException => {