diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 18:17:23 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 18:17:23 +0000 |
| commit | 6efd79feece53a52496a73da7605865404463b83 (patch) | |
| tree | ce32ded56d5cec7f2c334f0a5f1488595cae9261 /chrome | |
| parent | 883e41aaf2c712a34d60d9be1b5b7d9ee02f559e (diff) | |
| download | chromium_src-6efd79feece53a52496a73da7605865404463b83.zip chromium_src-6efd79feece53a52496a73da7605865404463b83.tar.gz chromium_src-6efd79feece53a52496a73da7605865404463b83.tar.bz2 | |
Revert r101718 "wait for test script to be loaded"
This change broke all of the page cycler tests on the
chromium.perf waterfall.
TBR=jnd@chromium.org
BUG=53140
TEST=page cyclers work again
Review URL: http://codereview.chromium.org/7941010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/perf/page_cycler_test.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index 31401ea..e07e36b 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -197,11 +197,6 @@ 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"", @@ -447,18 +442,20 @@ 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, Database##name##File) { \ +TEST_F(PageCyclerDatabaseTest, FLAKY_Database##name##File) { \ RunTest(test, test, false); \ } \ -TEST_F(PageCyclerDatabaseReferenceTest, Database##name##File) { \ +TEST_F(PageCyclerDatabaseReferenceTest, FLAKY_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, IndexedDB##name##File) { \ +TEST_F(PageCyclerIndexedDatabaseTest, FLAKY_IndexedDB##name##File) { \ RunTest(test, test, false); \ } \ TEST_F(PageCyclerIndexedDatabaseReferenceTest, IndexedDB##name##File) { \ |