Chromium Code Reviews| Index: tools/testing/dart/test_runner.dart |
| =================================================================== |
| --- tools/testing/dart/test_runner.dart (revision 23319) |
| +++ tools/testing/dart/test_runner.dart (working copy) |
| @@ -393,7 +393,8 @@ |
| List<BrowserTestCase> observers; |
| BrowserTestCase(displayName, commands, configuration, completedHandler, |
| - expectedOutcomes, info, isNegative, [this.waitingForOtherTest = false]) |
| + expectedOutcomes, info, isNegative, this.testingUrl, |
|
kustermann
2013/05/29 08:46:41
this.testingUrl -> this._testingUrl
|
| + [this.waitingForOtherTest = false]) |
| : super(displayName, commands, configuration, completedHandler, |
| expectedOutcomes, isNegative: isNegative, info: info) { |
| numRetries = 2; // Allow two retries to compensate for flaky browser tests. |
| @@ -406,6 +407,8 @@ |
| List<String> get batchTestArguments => _lastArguments.sublist(1); |
| + String _testingUrl; |
| + |
| /** Add a test case to listen for when this current test has completed. */ |
| void addObserver(BrowserTestCase testCase) { |
| observers.add(testCase); |
| @@ -420,6 +423,8 @@ |
| testCase.waitingForOtherTest = false; |
| } |
| } |
| + |
| + String get testingUrl => _testingUrl; |
| } |
| @@ -1661,13 +1666,8 @@ |
| } |
| void _startBrowserControllerTest(var test) { |
| - // Get the url. |
| - // TODO(ricow): This is not needed when we have eliminated selenium. |
| - var nextCommandIndex = test.commandOutputs.keys.length; |
| - var url = test.commands[nextCommandIndex].toString().split("--out=")[1]; |
| - // Remove trailing " |
| - url = url.split('"')[0]; |
| var callback = (var output) { |
| + var nextCommandIndex = test.commandOutputs.keys.length; |
| new CommandOutput.fromCase(test, |
| test.commands[nextCommandIndex], |
| 0, |
| @@ -1679,7 +1679,9 @@ |
| false); |
| test.completedHandler(test); |
| }; |
| - BrowserTest browserTest = new BrowserTest(url, callback, test.timeout); |
| + BrowserTest browserTest = new BrowserTest(test.testingUrl, |
| + callback, |
| + test.timeout); |
| _getBrowserTestRunner(test).then((testRunner) { |
| testRunner.queueTest(browserTest); |
| }); |