Fixed timeout for short number of processes

pharo-contributions · Jun 25, 2018 · 57a0920 · 57a0920
1 parent 2e012d5
commit 57a0920
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...s.package/OSSConcurrentProcessesTest.class/instance/launchAndWaitForProcessesToFinish..st b/...s.package/OSSConcurrentProcessesTest.class/instance/launchAndWaitForProcessesToFinish..st
@@ -6,10 +6,10 @@ launchAndWaitForProcessesToFinish: numberOfProcesses
 
 	| processes |
 	"We set the sunit test timeout to 1 second per process.
-	Otherwise default sunit test timeout is 1 minute.
+	Except for short running processes, where we keep the default timeout.
 	This is for Pharo version >= 6.0"
 	(self respondsTo: #timeLimit:) ifTrue: [ 
-		self timeLimit: numberOfProcesses seconds.
+		self timeLimit: (numberOfProcesses seconds max: self defaultTimeLimit).
 	].