Skip to content

Commit 2590b88

Browse files
committed
Get rid of another 3 stray Scalatest-dispatcher thread after run in FrameworkSuite by adding the missing .done() call.
1 parent e692ede commit 2590b88

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

scalatest-test/src/test/scala/org/scalatest/tools/FrameworkSuite.scala

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,13 @@ class FrameworkSuite extends FunSuite {
10521052
new TaskDef("org.scalatest.SuiteSuite", subclassFingerprint, false, Array(new SuiteSelector))))
10531053
assert(tasks.size === 1)
10541054
val runner2 = framework.runner(Array("-m", "org.scalatest.concurrent"), Array.empty, testClassLoader)
1055-
val tasks2 = runner2.tasks(Array(new TaskDef("org.scalatest.enablers.NoParamSpec", subclassFingerprint, false, Array(new SuiteSelector))))
1056-
assert(tasks2.size === 0)
1055+
try {
1056+
val tasks2 = runner2.tasks(Array(new TaskDef("org.scalatest.enablers.NoParamSpec", subclassFingerprint, false, Array(new SuiteSelector))))
1057+
assert(tasks2.size === 0)
1058+
}
1059+
finally {
1060+
runner2.done()
1061+
}
10571062
}
10581063
finally {
10591064
runner.done()
@@ -1097,7 +1102,8 @@ class FrameworkSuite extends FunSuite {
10971102
}
10981103

10991104
test("Framework.runner accept without problem when -P 4 is passed in") {
1100-
framework.runner(Array("-P4"), Array.empty, testClassLoader)
1105+
val runner = framework.runner(Array("-P4"), Array.empty, testClassLoader)
1106+
runner.done()
11011107
}
11021108

11031109
test("Framework.runner should throw IllegalArgumentException when -P0 is passed in") {
@@ -1143,7 +1149,8 @@ class FrameworkSuite extends FunSuite {
11431149
}
11441150

11451151
test("Framework.runner should be able to pass in test sorting timeout with -T") {
1146-
framework.runner(Array("-T", "100"), Array.empty, testClassLoader)
1152+
val runner = framework.runner(Array("-T", "100"), Array.empty, testClassLoader)
1153+
runner.done()
11471154
}
11481155

11491156
private def makeSureDone(runners: Runner*)(fun: => Unit): Unit = {

0 commit comments

Comments
 (0)