Chromium Code Reviews| Index: tools/testing/dart/test_runner.dart |
| =================================================================== |
| --- tools/testing/dart/test_runner.dart (revision 14052) |
| +++ tools/testing/dart/test_runner.dart (working copy) |
| @@ -77,6 +77,7 @@ |
| String displayName; |
| TestOutput output; |
| bool isNegative; |
| + bool usesWebDriver; |
|
Mads Ager (google)
2012/10/25 08:11:55
I'm not sure what we gain by having this as a memb
Emily Fortuna
2012/10/25 18:21:20
I agree. The reason I changed this is I was findin
Mads Ager (google)
2012/10/25 18:47:44
I strongly agree with your use of TestUtils.usesWe
|
| Set<String> expectedOutcomes; |
| TestCaseEvent completedHandler; |
| TestInformation info; |
| @@ -87,7 +88,8 @@ |
| this.completedHandler, |
| this.expectedOutcomes, |
| {this.isNegative: false, |
| - this.info: null}) { |
| + this.info: null, |
| + this.usesWebDriver: false}) { |
| if (!isNegative) { |
| this.isNegative = displayName.contains("negative_test"); |
| } |
| @@ -164,8 +166,6 @@ |
| List<String> get batchRunnerArguments => ['-batch']; |
| List<String> get batchTestArguments => commands.last().arguments; |
| - bool get usesWebDriver => TestUtils.usesWebDriver(configuration['runtime']); |
| - |
| void completed() { completedHandler(this); } |
| } |
| @@ -183,9 +183,10 @@ |
| int numRetries; |
| BrowserTestCase(displayName, commands, configuration, completedHandler, |
| - expectedOutcomes, info, isNegative) |
| + expectedOutcomes, info, isNegative, {useWebDriver: false}) |
| : super(displayName, commands, configuration, completedHandler, |
| - expectedOutcomes, isNegative: isNegative, info: info) { |
| + expectedOutcomes, isNegative: isNegative, info: info, |
| + usesWebDriver: useWebDriver) { |
| numRetries = 2; // Allow two retries to compensate for flaky browser tests. |
| } |
| @@ -1141,7 +1142,7 @@ |
| void _runTest(TestCase test) { |
| if (test.usesWebDriver) { |
| - browserUsed = test.configuration['browser']; |
| + browserUsed = test.configuration['runtime']; |
|
Mads Ager (google)
2012/10/25 08:11:55
Thank you! I hope this will work out on the bots.
|
| if (_needsSelenium) _ensureSeleniumServerRunning(); |
| } |
| _progress.testAdded(); |