summaryrefslogtreecommitdiffstats
path: root/chrome/test/automated_ui_tests
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 23:55:15 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 23:55:15 +0000
commit54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b (patch)
tree1591db9bbe04b443feb1c0fc385b68130e08b6b6 /chrome/test/automated_ui_tests
parentf9ff629f7e67baf59700abceacbdfb0c6014211a (diff)
downloadchromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.zip
chromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.tar.gz
chromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.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@58563 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.cc6
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());