diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 22:49:16 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 22:49:16 +0000 |
| commit | bd275b7593d5367744bfea78b6b1db2d07a1cbde (patch) | |
| tree | 12afa1414d73844b28fe75f983e1e2e8cc6764a1 | |
| parent | afb7acafbee71fd08510e3a4a8057320649d99b5 (diff) | |
| download | chromium_src-bd275b7593d5367744bfea78b6b1db2d07a1cbde.zip chromium_src-bd275b7593d5367744bfea78b6b1db2d07a1cbde.tar.gz chromium_src-bd275b7593d5367744bfea78b6b1db2d07a1cbde.tar.bz2 | |
Re-enable SlowTermination UI test on Windows and Linux
No explanation was given for what exactly was wrong when it was disabled, and it passes on the try bots.
BUG=None
TEST=SlowTermination should run and pass on Windows and Linux
Review URL: http://codereview.chromium.org/2825004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49847 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/fast_shutdown_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc index 6cb01aa..f7c9ab8 100644 --- a/chrome/test/ui/fast_shutdown_uitest.cc +++ b/chrome/test/ui/fast_shutdown_uitest.cc @@ -18,10 +18,17 @@ class FastShutdown : public UITest { }; +#if defined(OS_MACOSX) +// SimulateOSClick is broken on the Mac: http://crbug.com/45162 +#define MAYBE_SlowTermination DISABLED_SlowTermination +#else +#define MAYBE_SlowTermination SlowTermination +#endif + // This tests for a previous error where uninstalling an onbeforeunload // handler would enable fast shutdown even if an onUnload handler still // existed. -TEST_F(FastShutdown, DISABLED_SlowTermination) { +TEST_F(FastShutdown, MAYBE_SlowTermination) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<WindowProxy> window(browser->GetWindow()); |