Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Unified Diff: tools/testing/dart/test_runner.dart

Issue 11189150: Don't replicate timeout calculation for browser tests. They do their own timing (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/testing/dart/test_runner.dart
===================================================================
--- tools/testing/dart/test_runner.dart (revision 13986)
+++ tools/testing/dart/test_runner.dart (working copy)
@@ -610,8 +610,11 @@
process = null;
int totalSteps = testCase.commands.length;
String suffix =' (step $currentStep of $totalSteps)';
- if (timedOut) {
- // Test timed out before it could complete.
+ if (timedOut &&
+ !(testCase.usesWebDriver && !testCase.configuration['noBatch'])) {
Jennifer Messerly 2012/10/23 22:50:19 might want to add a property for: testCase.us
Emily Fortuna 2012/10/23 23:11:25 But the dartc tests also "usesBatchRunner"...
Mads Ager (google) 2012/10/24 05:56:14 I don't understand why this should change. If we a
Mads Ager (google) 2012/10/24 12:03:47 Something is completely off here. I don't see how
+ // Non-webdriver test timed out before it could complete. Webdriver tests
+ // run their own timeouts by timing from the launch of the browser (which
+ // could be delayed).
testComplete(0, true);
} else if (currentStep == totalSteps) {
// Done with all test commands.
« tools/testing/dart/test_options.dart ('K') | « tools/testing/dart/test_options.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698