diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 20:10:05 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 20:10:05 +0000 |
| commit | 73fa1fce36052cbec5fe91936f6bd477bd81cd09 (patch) | |
| tree | 952d45620504321add0489e3cf49d95ecb4a0eba | |
| parent | e32887ae05c5dc9aa121a40aee0bdfb934e7fb2e (diff) | |
| download | chromium_src-73fa1fce36052cbec5fe91936f6bd477bd81cd09.zip chromium_src-73fa1fce36052cbec5fe91936f6bd477bd81cd09.tar.gz chromium_src-73fa1fce36052cbec5fe91936f6bd477bd81cd09.tar.bz2 | |
Disable ExtensionApiTest.PopupBlockingExtension on Windows.
BUG=177530
Review URL: https://codereview.chromium.org/12316046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183851 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/window_open_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index b448aee..d9b93b6 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -156,7 +156,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpenPopupSmall) { EXPECT_TRUE(WaitForTabsAndPopups(browser(), num_tabs, num_popups, 0)); } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingExtension) { +// Disabled on Windows. Often times out or fails: crbug.com/177530 +#if defined(OS_WIN) +#define MAYBE_PopupBlockingExtension DISABLED_PopupBlockingExtension +#else +#define MAYBE_PopupBlockingExtension PopupBlockingExtension +#endif +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_PopupBlockingExtension) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); |