diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 19:57:01 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 19:57:01 +0000 |
| commit | 4c8b8cdd54675ef5b3dad3a9668cf38093a9659d (patch) | |
| tree | f8009fe85940b849a87c7eca75ee4d4c40d60a53 /chrome/test/perf/page_cycler_test.cc | |
| parent | c98ecb3842bc68104bfbf92a610bfc994e5fac7c (diff) | |
| download | chromium_src-4c8b8cdd54675ef5b3dad3a9668cf38093a9659d.zip chromium_src-4c8b8cdd54675ef5b3dad3a9668cf38093a9659d.tar.gz chromium_src-4c8b8cdd54675ef5b3dad3a9668cf38093a9659d.tar.bz2 | |
Wait for test script to be loaded before calling __get_timings
Set a variable to indicate that the result report page
is loaded. See detailed analysis in crbug.com/53140.
This is relanding r101718 after a revert at r101778.
BUG=53140
TBR=jnd@chromium.org
TEST=page cycler stays green
Review URL: http://codereview.chromium.org/7941015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf/page_cycler_test.cc')
| -rw-r--r-- | chrome/test/perf/page_cycler_test.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index e07e36b..31401ea 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -197,6 +197,11 @@ class PageCyclerTest : public UIPerfTest { pages->assign(UTF8ToWide(cookie)); ASSERT_FALSE(pages->empty()); + // Wait for the report.html to be loaded. + ASSERT_TRUE(WaitUntilCookieValue( + tab.get(), test_url, "__navigated_to_report", + TestTimeouts::action_max_timeout_ms(), "1")); + // Get the timing cookie value from the DOM automation. std::wstring wcookie; ASSERT_TRUE(tab->ExecuteAndExtractString(L"", @@ -442,20 +447,18 @@ TEST_F(PageCyclerReferenceTest, name) { \ // This macro simplifies setting up regular and reference build tests // for HTML5 database tests. -// FLAKY http://crbug.com/67918 #define PAGE_CYCLER_DATABASE_TESTS(test, name) \ -TEST_F(PageCyclerDatabaseTest, FLAKY_Database##name##File) { \ +TEST_F(PageCyclerDatabaseTest, Database##name##File) { \ RunTest(test, test, false); \ } \ -TEST_F(PageCyclerDatabaseReferenceTest, FLAKY_Database##name##File) { \ +TEST_F(PageCyclerDatabaseReferenceTest, Database##name##File) { \ RunTest(test, test, false); \ } // This macro simplifies setting up regular and reference build tests // for HTML5 Indexed DB tests. -// FLAKY http://crbug.com/67918 #define PAGE_CYCLER_IDB_TESTS(test, name) \ -TEST_F(PageCyclerIndexedDatabaseTest, FLAKY_IndexedDB##name##File) { \ +TEST_F(PageCyclerIndexedDatabaseTest, IndexedDB##name##File) { \ RunTest(test, test, false); \ } \ TEST_F(PageCyclerIndexedDatabaseReferenceTest, IndexedDB##name##File) { \ |