Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moving the require and suite creation to master process seems to fix …

…several errors. I think this is due to a lag between registering a module and actually loading a module.

I also increased the timeout to 60 seconds because one test in Cappuccino (the last one it turns out..) seems to take take long. In the future this should be configurable.
  • Loading branch information...
commit cbaa67b1a5e29f1bf0440464ae84048725f60347 1 parent a45290d
Derek Hammer authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 Frameworks/OJUnit/OJTestRunnerTextParallel.j
View
16 Frameworks/OJUnit/OJTestRunnerTextParallel.j
@@ -42,14 +42,14 @@
if (matches)
{
+ system.stderr.write(matches[1]).flush();
+ var testCaseClass = matches[1];
+
+ [self beforeRequire];
+ require(testCaseFile);
+ var suite = [self getTest:testCaseClass];
+
var runTestFunction = function() {
- system.stderr.write(matches[1]).flush();
- var testCaseClass = matches[1];
-
- [self beforeRequire];
- require(testCaseFile);
-
- var suite = [self getTest:testCaseClass];
[self run:suite];
};
@@ -101,7 +101,7 @@
var startTime = new Date();
while(![self threadsDone])
{
- if ([self hasWaited:15 since:startTime]) {
+ if ([self hasWaited:60 since:startTime]) {
system.print("Test timed out!");
break;
}
Please sign in to comment.
Something went wrong with that request. Please try again.