summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 09:30:14 +0000
committertyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 09:30:14 +0000
commit06f3cb6381bee15cad9dab884dedaa8d09ae69c6 (patch)
tree4c5de095e9473bdd0d03b0f6cb036e7b4a68c3bf /chrome
parent1b1dd2f0e337abece5b9e619e5af9262f03f62ca (diff)
downloadchromium_src-06f3cb6381bee15cad9dab884dedaa8d09ae69c6.zip
chromium_src-06f3cb6381bee15cad9dab884dedaa8d09ae69c6.tar.gz
chromium_src-06f3cb6381bee15cad9dab884dedaa8d09ae69c6.tar.bz2
Mark NetworkScreenTest.Timeout FLAKY.
It's failing consistently when it's on Linux Tests (Views dbg)(3) bot while it's passing consistently when it's on other View dbg bots. BUG=89392 TEST=none Review URL: http://codereview.chromium.org/7389006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/login/network_screen_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
index 67f565a..44d6d28 100644
--- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
@@ -240,7 +240,13 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Cellular) {
EmulateContinueButtonExit(network_screen_);
}
-IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
+// See crbug.com/89392
+#if defined(OS_LINUX)
+#define MAYBE_Timeout FLAKY_Timeout
+#else
+#define MAYBE_Timeout Timeout
+#endif
+IN_PROC_BROWSER_TEST_F(NetworkScreenTest, MAYBE_Timeout) {
EXPECT_CALL(*mock_network_library_, ethernet_connected())
.WillOnce((Return(false)));
EXPECT_CALL(*mock_network_library_, wifi_connected())