summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 21:06:17 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 21:06:17 +0000
commitff597818726a77ebe24cc69bafb946df8b1bbe29 (patch)
treec31b753775b11ccd76b56d3ea4d56bdd9d1103d3
parent3782ecb3ed2bfc59f6c3db22a3f263f3266ba5e9 (diff)
downloadchromium_src-ff597818726a77ebe24cc69bafb946df8b1bbe29.zip
chromium_src-ff597818726a77ebe24cc69bafb946df8b1bbe29.tar.gz
chromium_src-ff597818726a77ebe24cc69bafb946df8b1bbe29.tar.bz2
GTTF: flip FastShutdown.SlowTermination from FAILS to FLAKY
on Linux, because it is flaky. TBR=estade TEST=FastShutdown.SlowTermination BUG=46614 Review URL: http://codereview.chromium.org/2825069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53679 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/ui/fast_shutdown_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc
index 8db0218..758ca156f 100644
--- a/chrome/test/ui/fast_shutdown_uitest.cc
+++ b/chrome/test/ui/fast_shutdown_uitest.cc
@@ -23,7 +23,7 @@ class FastShutdown : public UITest {
#define MAYBE_SlowTermination DISABLED_SlowTermination
#elif defined(OS_LINUX)
// http://crbug.com/46614
-#define MAYBE_SlowTermination FAILS_SlowTermination
+#define MAYBE_SlowTermination FLAKY_SlowTermination
#else
// Times out: http://crbug.com/46616
#define MAYBE_SlowTermination DISABLED_SlowTermination