summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-18 17:19:31 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-18 17:19:31 +0000
commit50ca28cf1390710a23342e8a3ec273da9dc61007 (patch)
treeb4f72f487952ace91342c981cef6622911fa7cdd
parent491451a63cc032d48623e843f81a3b09d6eab127 (diff)
downloadchromium_src-50ca28cf1390710a23342e8a3ec273da9dc61007.zip
chromium_src-50ca28cf1390710a23342e8a3ec273da9dc61007.tar.gz
chromium_src-50ca28cf1390710a23342e8a3ec273da9dc61007.tar.bz2
Speed up RendererCrashTest.
Review URL: http://codereview.chromium.org/115430 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16294 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/logging_chrome_uitest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 99fac8d..737028a 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -10,6 +10,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
#include "chrome/common/logging_chrome.h"
+#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/ui/ui_test.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -107,8 +108,8 @@ TEST_F(RendererCrashTest, Crash) {
// in process mode doesn't do the crashing.
expected_crashes_ = 0;
} else {
- // Wait while the process is writing the crash dump.
- PlatformThread::Sleep(5000);
+ scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+ ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
expected_crashes_ = 1;
}
}
@@ -126,7 +127,7 @@ class BrowserCrashTest : public UITest {
};
// Launch the app in browser crash test mode.
-// This test is disabled. See bug 1198934.
+// This test is disabled. See bug 6910.
TEST_F(BrowserCrashTest, DISABLED_Crash) {
// Wait while the process is writing the crash dump.
PlatformThread::Sleep(5000);