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

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

Issue 726563002: Do not retry intentionally failing tests on browsers. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | tools/testing/dart/test_suite.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/test_runner.dart
diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
index 8b1cc55887bdbf40eaaffdc968f0e81169496c45..bf28d11163a887a959b5171c19e510d18088205b 100644
--- a/tools/testing/dart/test_runner.dart
+++ b/tools/testing/dart/test_runner.dart
@@ -262,10 +262,12 @@ class BrowserTestCommand extends Command {
final String browser;
final String url;
final Map configuration;
+ final bool retry;
BrowserTestCommand._(String _browser,
this.url,
- this.configuration)
+ this.configuration,
+ this.retry)
: super._(_browser), browser = _browser;
void _buildHashCode(HashCodeBuilder builder) {
@@ -273,13 +275,15 @@ class BrowserTestCommand extends Command {
builder.addJson(browser);
builder.addJson(url);
builder.add(configuration);
+ builder.add(retry);
}
bool _equal(BrowserTestCommand other) =>
super._equal(other) &&
browser == other.browser &&
url == other.url &&
- identical(configuration, other.configuration);
+ identical(configuration, other.configuration) &&
+ retry == other.retry;
String get reproductionCommand {
var parts = [TestUtils.dartTestExecutable.toString(),
@@ -295,8 +299,9 @@ class BrowserHtmlTestCommand extends BrowserTestCommand {
BrowserHtmlTestCommand._(String browser,
String url,
Map configuration,
- this.expectedMessages)
- : super._(browser, url, configuration);
+ this.expectedMessages,
+ bool retry)
+ : super._(browser, url, configuration, retry);
void _buildHashCode(HashCodeBuilder builder) {
super._buildHashCode(builder);
@@ -566,17 +571,19 @@ class CommandBuilder {
BrowserTestCommand getBrowserTestCommand(String browser,
String url,
- Map configuration) {
- var command = new BrowserTestCommand._(browser, url, configuration);
+ Map configuration,
+ bool retry) {
+ var command = new BrowserTestCommand._(browser, url, configuration, retry);
return _getUniqueCommand(command);
}
BrowserHtmlTestCommand getBrowserHtmlTestCommand(String browser,
String url,
Map configuration,
- List<String> expectedMessages) {
+ List<String> expectedMessages,
+ bool retry) {
var command = new BrowserHtmlTestCommand._(
- browser, url, configuration, expectedMessages);
+ browser, url, configuration, expectedMessages, retry);
return _getUniqueCommand(command);
}
@@ -2616,10 +2623,11 @@ class ReplayingCommandExecutor implements CommandExecutor {
bool shouldRetryCommand(CommandOutput output) {
var command = output.command;
// We rerun tests on Safari because 6.2 and 7.1 are flaky. Issue 21434.
- if (command is BrowserTestCommand && command.browser == 'safari' &&
+ if (command is BrowserTestCommand &&
+ command.retry &&
+ command.browser == 'safari' &&
output is BrowserControllerTestOutcome &&
output._rawOutcome != Expectation.PASS) {
- // TODO(whesse): This retries tests that fail intentionally. Fix this
return true;
}
@@ -2647,7 +2655,9 @@ bool shouldRetryCommand(CommandOutput output) {
}
// We currently rerun dartium tests, see issue 14074.
- if (command is BrowserTestCommand && command.browser == 'dartium') {
+ if (command is BrowserTestCommand &&
+ command.retry &&
+ command.browser == 'dartium') {
return true;
}
}
« no previous file with comments | « no previous file | tools/testing/dart/test_suite.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698