diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 19:32:13 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 19:32:13 +0000 |
| commit | 61855fc2c781be3419e159e959078670ec6a6483 (patch) | |
| tree | 1c8c381a933f52991f70832804b67f48b910a608 /chrome/test/automated_ui_tests | |
| parent | 979466dbde52af02c5ad15fcd0528ca0d3d85b05 (diff) | |
| download | chromium_src-61855fc2c781be3419e159e959078670ec6a6483.zip chromium_src-61855fc2c781be3419e159e959078670ec6a6483.tar.gz chromium_src-61855fc2c781be3419e159e959078670ec6a6483.tar.bz2 | |
GTTF: Make WaitForTabCountToBecome automation call not Sleep.
Sleeping is an unreliable method to wait for things.
Instead, we set up an observer.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3300011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
| -rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc index b3952b2..c4c1eec 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc @@ -10,8 +10,7 @@ TEST_F(AutomatedUITestBase, DragOut) { NewTab(); NewTab(); - ASSERT_TRUE(active_browser()-> - WaitForTabCountToBecome(3, action_max_timeout_ms())); + ASSERT_TRUE(active_browser()->WaitForTabCountToBecome(3)); PlatformThread::Sleep(sleep_timeout_ms()); ASSERT_TRUE(DragTabOut()); int window_count; @@ -22,8 +21,7 @@ TEST_F(AutomatedUITestBase, DragOut) { TEST_F(AutomatedUITestBase, DragLeftRight) { NewTab(); NewTab(); - ASSERT_TRUE(active_browser()-> - WaitForTabCountToBecome(3, action_max_timeout_ms())); + ASSERT_TRUE(active_browser()->WaitForTabCountToBecome(3)); // TODO(phajdan.jr): We need a WaitForTabstripAnimationsToEnd() function. // Every sleep in this file should be replaced with it. PlatformThread::Sleep(sleep_timeout_ms()); |