From 36e1679f1d5e43690fe3a56e05a4e63e3e79430d Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Tue, 5 Oct 2010 18:59:55 +0000 Subject: HistoryBrowserTest.SavingHistoryDisabled and SavingHistoryDisabledThenEnabled timeout / fails Disabling failing tests on Vista. http://build.chromium.org/buildbot/waterfall/builders/Vista%20Tests/builds/23137/steps/browser_tests/logs/stdio Note: Google Test filter = HistoryBrowserTest.SavingHistoryDisabled [==========] Running 1 test from 1 test case. [----------] Global test environment set-up. [----------] 1 test from HistoryBrowserTest [ RUN ] HistoryBrowserTest.SavingHistoryDisabled [3040:568:1005/060732:99222312:INFO:install_util.cc(72)] No existing Chrome install found. [3040:4140:1005/060732:99222453:INFO:chrome_plugin_lib.cc(201)] ChromePluginLib::CP_Initialize(c:\b\slave\chromium-rel-vista-tests\build\src\build\Release\gears.dll): initialized=0 [3040:4140:1005/060732:99222453:INFO:chrome_plugin_lib.cc(222)] ChromePluginLib::CP_Initialize(c:\b\slave\chromium-rel-vista-tests\build\src\build\Release\gear command timed out: 600 seconds without output, killing pid 5712 program finished with exit code 1 elapsedTime=919.310000 http://build.chromium.org/buildbot/waterfall/builders/Vista%20Tests/builds/23142/steps/browser_tests/logs/stdio Note: Google Test filter = HistoryBrowserTest.SavingHistoryDisabledThenEnabled [==========] Running 1 test from 1 test case. [----------] Global test environment set-up. [----------] 1 test from HistoryBrowserTest [ RUN ] HistoryBrowserTest.SavingHistoryDisabledThenEnabled [5828:4796:1005/082951:107761968:INFO:install_util.cc(72)] No existing Chrome install found. [5828:5820:1005/082951:107762109:INFO:chrome_plugin_lib.cc(201)] ChromePluginLib::CP_Initialize(c:\b\slave\chromium-rel-vista-tests\build\src\build\Release\gears.dll): initialized=0 [5828:5820:1005/082951:107762109:INFO:chrome_plugin_lib.cc(222)] ChromePluginLib::CP_Initialize(c:\b\slave\chromium-rel-vista-tests\build\src\build\Release\gears.dll): initialized=1): result=0 [ OK ] HistoryBrowserTest.SavingHistoryDisabledThenEnabled (251 ms) [----------] 1 test from HistoryBrowserTest (251 ms total) [----------] Global test environment tear-down [==========] 1 test from 1 test case r command timed out: 600 seconds without output, killing pid 2452 program finished with exit code 1 elapsedTime=921.136000 BUG=57994 TEST=HistoryBrowserTest.SavingHistoryDisabled and SavingHistoryDisabledThenEnabled TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3570010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61537 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/history/history_browsertest.cc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'chrome/browser/history') diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 72ddc9d..0d9e1e2 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -139,8 +139,15 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabled) { } } +// Times out on Vista only. http://crbug.com/57994 +#if defined(OS_WIN) +#define MAYBE_SavingHistoryDisabled DISABLED_SavingHistoryDisabled +#else +#define MAYBE_SavingHistoryDisabled SavingHistoryDisabled +#endif + // Test that disabling saving browser history really works. -IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) { +IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_SavingHistoryDisabled) { GetPrefs()->SetBoolean(prefs::kSavingBrowserHistoryDisabled, true); EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS)); @@ -154,9 +161,18 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) { ExpectEmptyHistory(); } +// Times out on Vista only. http://crbug.com/57994 +#if defined(OS_WIN) +#define MAYBE_SavingHistoryEnabledThenDisabled \ + DISABLED_SavingHistoryEnabledThenDisabled +#else +#define MAYBE_SavingHistoryEnabledThenDisabled SavingHistoryEnabledThenDisabled +#endif + // Test that changing the pref takes effect immediately // when the browser is running. -IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabledThenDisabled) { +IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, + MAYBE_SavingHistoryEnabledThenDisabled) { EXPECT_FALSE(GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)); ui_test_utils::WaitForHistoryToLoad(browser()); -- cgit v1.1