diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 23:00:27 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 23:00:27 +0000 |
| commit | d0a7e000193d0ac74c79671f953dcc704852be8e (patch) | |
| tree | 543ba1d6bd9b386b7be02620c0fd1b6ebffd9420 /chrome/browser/extensions/extension_browsertests_misc.cc | |
| parent | 6ae592e4947c687e6c695b0a3b117dd7512d357e (diff) | |
| download | chromium_src-d0a7e000193d0ac74c79671f953dcc704852be8e.zip chromium_src-d0a7e000193d0ac74c79671f953dcc704852be8e.tar.gz chromium_src-d0a7e000193d0ac74c79671f953dcc704852be8e.tar.bz2 | |
Re-enable ExtensionBrowserTest.AutoUpdate on non-linux platforms.
BUG=31737
TEST=(this is re-enabling a test on win/mac)
Review URL: http://codereview.chromium.org/537001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertests_misc.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 6b9822b..39fca8261 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -828,8 +828,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { EXPECT_FALSE(result); } +// TODO(asargent): This test seems to crash on linux buildbots. +// (http://crbug.com/31737) +#if !defined(OS_LINUX) // Tests extension autoupdate. -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_AutoUpdate) { +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, AutoUpdate) { FilePath basedir = test_data_dir_.AppendASCII("autoupdate"); // Note: This interceptor gets requests on the IO thread. scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor()); @@ -877,6 +880,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_AutoUpdate) { ASSERT_EQ("ogjcoiohnmldgjemafoockdghcjciccf", extensions->at(0)->id()); ASSERT_EQ("2.0", extensions->at(0)->VersionString()); } +#endif // !defined(OS_LINUX) // Used to simulate a click on the first button named 'Options'. static const wchar_t* jscript_click_option_button = |