diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 02:08:04 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 02:08:04 +0000 |
| commit | 7ff06cb105229bbde21942f4854cd46a67941238 (patch) | |
| tree | 0cd5b5c5f0e9375bf4af57dd67412e25539d3a34 | |
| parent | 1a30a2f34ee9967f85b768b9f2c874da793e37dd (diff) | |
| download | chromium_src-7ff06cb105229bbde21942f4854cd46a67941238.zip chromium_src-7ff06cb105229bbde21942f4854cd46a67941238.tar.gz chromium_src-7ff06cb105229bbde21942f4854cd46a67941238.tar.bz2 | |
Linux: Re-enable UnloadTest and ProcessSingletonTest now that shared library build is fixed.
(https://bugs.webkit.org/show_bug.cgi?id=46762)
TEST=try bots, local shlib build
BUG=47575,47979
Review URL: http://codereview.chromium.org/3624002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61598 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/process_singleton_uitest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/unload_uitest.cc | 25 |
2 files changed, 10 insertions, 23 deletions
diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index 28ae962..94f6f6d 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_uitest.cc @@ -216,13 +216,7 @@ class ProcessSingletonTest : public UITest { ScopedTempDir temp_profile_dir_; }; -#if defined(OS_LINUX) -// http://crbug.com/47979 -#define MAYBE_StartupRaceCondition FAILS_StartupRaceCondition -#else -#define MAYBE_StartupRaceCondition StartupRaceCondition -#endif -TEST_F(ProcessSingletonTest, MAYBE_StartupRaceCondition) { +TEST_F(ProcessSingletonTest, StartupRaceCondition) { // We use this to stop the attempts loop on the first failure. bool failed = false; for (size_t attempt = 0; attempt < kNbAttempts && !failed; ++attempt) { diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index 1fb8742..500d3a0 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -15,13 +15,6 @@ #include "net/url_request/url_request_unittest.h" #include "views/event.h" -#if defined(OS_LINUX) -// http://crbug.com/47575 -#define SKIP_LINUX(test) DISABLED_##test -#else -#define SKIP_LINUX(test) test -#endif - const std::string NOLISTENERS_HTML = "<html><head><title>nolisteners</title></head><body></body></html>"; @@ -278,13 +271,13 @@ TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadSync) { } // Tests closing the browser on a page with no unload listeners registered. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseNoUnloadListeners)) { +TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) { LoadUrlAndQuitBrowser(NOLISTENERS_HTML, L"nolisteners"); } // Tests closing the browser on a page with an unload listener registered. // Test marked as flaky in http://crbug.com/51698 -TEST_F(UnloadTest, SKIP_LINUX(FLAKY_BrowserCloseUnload)) { +TEST_F(UnloadTest, FLAKY_BrowserCloseUnload) { LoadUrlAndQuitBrowser(UNLOAD_HTML, L"unload"); } @@ -343,14 +336,14 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) { // Tests closing the browser with a beforeunload handler that takes // two seconds to run. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseTwoSecondBeforeUnload)) { +TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) { LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_HTML, L"twosecondbeforeunload"); } // Tests closing the browser on a page with an unload listener registered where // the unload handler has an infinite loop. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteUnload)) { +TEST_F(UnloadTest, BrowserCloseInfiniteUnload) { // Tests makes no sense in single-process mode since the renderer is hung. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; @@ -359,7 +352,7 @@ TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteUnload)) { } // Tests closing the browser with a beforeunload handler that hangs. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteBeforeUnload)) { +TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnload) { // Tests makes no sense in single-process mode since the renderer is hung. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; @@ -369,7 +362,7 @@ TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteBeforeUnload)) { // Tests closing the browser on a page with an unload listener registered where // the unload handler has an infinite loop followed by an alert. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteUnloadAlert)) { +TEST_F(UnloadTest, BrowserCloseInfiniteUnloadAlert) { // Tests makes no sense in single-process mode since the renderer is hung. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; @@ -379,7 +372,7 @@ TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteUnloadAlert)) { // Tests closing the browser with a beforeunload handler that hangs then // pops up an alert. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteBeforeUnloadAlert)) { +TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnloadAlert) { // Tests makes no sense in single-process mode since the renderer is hung. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) return; @@ -390,13 +383,13 @@ TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseInfiniteBeforeUnloadAlert)) { // Tests closing the browser on a page with an unload listener registered where // the unload handler has an 2 second long loop followed by an alert. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseTwoSecondUnloadAlert)) { +TEST_F(UnloadTest, BrowserCloseTwoSecondUnloadAlert) { LoadUrlAndQuitBrowser(TWO_SECOND_UNLOAD_ALERT_HTML, L"twosecondunloadalert"); } // Tests closing the browser with a beforeunload handler that takes // two seconds to run then pops up an alert. -TEST_F(UnloadTest, SKIP_LINUX(BrowserCloseTwoSecondBeforeUnloadAlert)) { +TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) { LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML, L"twosecondbeforeunloadalert"); } |