summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-08-26 20:18:10 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-08-27 03:20:45 +0000
commit3f7aec31073c730a68ee221bbd10dca9a60e9a04 (patch)
tree2675e91ca8b35edacf75b84182a86d00be6efdcc
parent39faa5f9ae39fafd369406c7da9d0dd10c1f8094 (diff)
downloadchromium_src-3f7aec31073c730a68ee221bbd10dca9a60e9a04.zip
chromium_src-3f7aec31073c730a68ee221bbd10dca9a60e9a04.tar.gz
chromium_src-3f7aec31073c730a68ee221bbd10dca9a60e9a04.tar.bz2
Disable AppApiTest.AppProcessRedirectBack as its flaky.
BUG=341898 TBR=mpcomplete@chromium.org Review URL: https://codereview.chromium.org/511723002 Cr-Commit-Position: refs/heads/master@{#292089}
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index a5c7f31..3567e043 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -376,13 +376,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {
// 3. page2 redirects back to a page in the app
// The final navigation should end up in the app process.
// See http://crbug.com/61757
-// Flaky on Linux. http://crbug.com/341898
-#if defined(OS_LINUX)
-#define MAYBE_AppProcessRedirectBack DISABLED_AppProcessRedirectBack
-#else
-#define MAYBE_AppProcessRedirectBack AppProcessRedirectBack
-#endif
-IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) {
+// Flaky. http://crbug.com/341898
+IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcessRedirectBack) {
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());