diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 03:01:41 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 03:01:41 +0000 |
| commit | 4628913cfce702f7cbe81ae1d654d14e28c17288 (patch) | |
| tree | 0b104445b1a6a74f473a7fbf2fcb6fb5b549767f /chrome/browser/page_cycler | |
| parent | 0d8a30509157c2dd62fceec486ea4abc0efe2134 (diff) | |
| download | chromium_src-4628913cfce702f7cbe81ae1d654d14e28c17288.zip chromium_src-4628913cfce702f7cbe81ae1d654d14e28c17288.tar.gz chromium_src-4628913cfce702f7cbe81ae1d654d14e28c17288.tar.bz2 | |
PageCyclerCachedBrowserTest.PlaybackMode fails randomly on Linux debug and release
Also make the macros a bit more readable.
BUG=159026
Review URL: https://chromiumcodereview.appspot.com/11369057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_cycler')
| -rw-r--r-- | chrome/browser/page_cycler/page_cycler_browsertest.cc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc index 032fd24..476ab5a 100644 --- a/chrome/browser/page_cycler/page_cycler_browsertest.cc +++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc @@ -311,16 +311,17 @@ IN_PROC_BROWSER_TEST_F(PageCyclerBrowserTest, ChromeErrorURL) { ASSERT_FALSE(errors[0].compare(expected_error)); } -// Test that PageCycler will visit all the urls from a cache directory -// successfully while in playback mode. -#if defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) // TODO(rdevlin.cronin): Perhaps page cycler isn't completely implemented on // ChromeOS? -#else -#if (defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) && \ - !defined(NDEBUG) + +// Test that PageCycler will visit all the urls from a cache directory +// successfully while in playback mode. +#if defined(OS_LINUX) +// Bug 159026: Fails on Linux in both debug and release mode. +#define MAYBE_PlaybackMode DISABLED_PlaybackMode +#elif (defined(OS_WIN) || defined(OS_MACOSX) ) && !defined(NDEBUG) // Bug 131333: This test fails on a XP debug bot since Build 17609. -// Bug 159026: Also fails on Linux debug bot. #define MAYBE_PlaybackMode DISABLED_PlaybackMode #else #define MAYBE_PlaybackMode PlaybackMode @@ -340,6 +341,11 @@ IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_PlaybackMode) { ASSERT_TRUE(file_util::PathExists(stats_file())); ASSERT_FALSE(file_util::PathExists(errors_file())); } +#endif // !defined(OS_CHROMEOS) + +#if !defined(OS_CHROMEOS) +// TODO(rdevlin.cronin): Perhaps page cycler isn't completely implemented on +// ChromeOS? // Test that PageCycler will have a cache miss if a URL is missing from the // cache directory while in playback mode. @@ -386,4 +392,4 @@ IN_PROC_BROWSER_TEST_F(PageCyclerCachedBrowserTest, MAYBE_URLNotInCache) { ASSERT_FALSE(errors[0].compare(expected_error)); } -#endif +#endif // !defined(OS_CHROMEOS) |