summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 18:20:05 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 18:20:05 +0000
commit9f1d28b7547a293c1c78aa8c18e962979e8612a4 (patch)
treec3101bb2c1291a24ff788a3969fd4f1b943f1293 /chrome/app
parent09534699064c98867072fbfedaa810626b182e63 (diff)
downloadchromium_src-9f1d28b7547a293c1c78aa8c18e962979e8612a4.zip
chromium_src-9f1d28b7547a293c1c78aa8c18e962979e8612a4.tar.gz
chromium_src-9f1d28b7547a293c1c78aa8c18e962979e8612a4.tar.bz2
Make SecondLaunch UI test not-flaky by using more reliable
automation calls. BUG=5671 Review URL: http://codereview.chromium.org/40301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main_uitest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index 6038c9c..b70e58c 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -35,17 +35,13 @@ TEST_F(ChromeMainTest, AppTestingInterface) {
}
// Make sure that the second invocation creates a new window.
-// This test is disabled. See bug 5671.
-TEST_F(ChromeMainTest, DISABLED_SecondLaunch) {
+TEST_F(ChromeMainTest, SecondLaunch) {
include_testing_id_ = false;
use_existing_browser_ = true;
LaunchBrowser(CommandLine(L""), false);
- int window_count;
- ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
- action_timeout_ms()));
- ASSERT_EQ(2, window_count);
+ ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, action_timeout_ms()));
}
TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {