Index: LayoutTests/resources/js-test.js |
diff --git a/LayoutTests/resources/js-test.js b/LayoutTests/resources/js-test.js |
index 985f49f60213af05b1b00cecc02f42134f2cdeb7..726ffbd45074e3eff5ee8419acb8c28ed2e65716 100644 |
--- a/LayoutTests/resources/js-test.js |
+++ b/LayoutTests/resources/js-test.js |
@@ -8,7 +8,7 @@ if (self.testRunner) { |
var description, debug, successfullyParsed; |
-var expectingError; // set by shouldHaveError() |
+var expectingError; // set by expectError() |
var expectedErrorMessage; // set by onerror when expectingError is true |
var unexpectedErrorMessage; // set by onerror when expectingError is not true |
@@ -101,7 +101,8 @@ var unexpectedErrorMessage; // set by onerror when expectingError is not true |
if (self.expectingError) { |
self.expectedErrorMessage = message; |
self.expectingError = false; |
- return; |
+ // Consume expected error in worker, so window doesn't fail the test. |
+ return isWorker(); |
} |
self.unexpectedErrorMessage = message; |
if (self.jsTestIsAsync) { |
@@ -631,7 +632,7 @@ function shouldBeNow(a, delta) |
function expectError() |
{ |
if (expectingError) { |
- testFailed("shouldHaveError() called twice before an error occurred!"); |
+ testFailed("expectError() called twice before an error occurred!"); |
} |
expectingError = true; |
} |