diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:17:06 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 20:17:06 +0000 |
| commit | 512b05bea026992f34214850cfaea8d48e646296 (patch) | |
| tree | a0608399d052986777577c8ad328e53660c9dddc /content | |
| parent | 955e1cba2079a92082f220dfe56d19d33445c3d1 (diff) | |
| download | chromium_src-512b05bea026992f34214850cfaea8d48e646296.zip chromium_src-512b05bea026992f34214850cfaea8d48e646296.tar.gz chromium_src-512b05bea026992f34214850cfaea8d48e646296.tar.bz2 | |
Add logging to see why WorkerTest.LimitTotal is hanging on XP buildbots. Also add more logging to InProcessBrowserLayoutTest.
BUG=36800
TBR=atwilson
Review URL: https://chromiumcodereview.appspot.com/9924021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/worker_host/test/worker_browsertest.cc | 6 | ||||
| -rw-r--r-- | content/test/layout_browsertest.cc | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index d082c2b..558977a 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -4,6 +4,7 @@ #include "base/bind.h" #include "base/file_path.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/stringprintf.h" #include "base/string_util.h" @@ -395,6 +396,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { // Adding 1 so that we cause some workers to be queued. int tab_count = (total_workers / max_workers_per_tab) + 1; for (int i = 1; i < tab_count; ++i) { + LOG(INFO) << "LimitTotal creating tab"; ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(url.spec() + StringPrintf("&client_id=%d", i)), NEW_FOREGROUND_TAB, @@ -402,7 +404,9 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { } // Check that we didn't create more than the max number of workers. + LOG(INFO) << "LimitTotal calling WaitForWorkerProcessCount"; ASSERT_TRUE(WaitForWorkerProcessCount(total_workers)); + LOG(INFO) << "LimitTotal WaitForWorkerProcessCount returned"; // Now close a page and check that the queued workers were started. const FilePath kGoogleDir(FILE_PATH_LITERAL("google")); @@ -410,7 +414,9 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { url = GURL(ui_test_utils::GetTestUrl(kGoogleDir, kGoogleFile)); ui_test_utils::NavigateToURL(browser(), url); + LOG(INFO) << "LimitTotal calling WaitForWorkerProcessCount"; ASSERT_TRUE(WaitForWorkerProcessCount(total_workers)); + LOG(INFO) << "LimitTotal WaitForWorkerProcessCount returned"; } // Flaky, http://crbug.com/59786. diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 6f8035c..dbd084f 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -180,6 +180,7 @@ void InProcessBrowserLayoutTest::RunLayoutTestInternal( ui_test_utils::TitleWatcher title_watcher( browser()->GetSelectedWebContents(), expected_title); ui_test_utils::NavigateToURL(browser(), url); + LOG(INFO) << "Navigation completed, now waiting for title."; string16 final_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); |