Skip to content

Commit

Permalink
Re-enable SlowTermination UI test on Windows and Linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
stuartmorgan@chromium.org committed Jun 15, 2010
1 parent afb7aca commit bd275b7
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion chrome/test/ui/fast_shutdown_uitest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down

0 comments on commit bd275b7

Please sign in to comment.