Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(421)

Unified Diff: chrome/test/perf/page_cycler_test.cc

Issue 7941015: Wait for test script to be loaded before calling __get_timings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix copyright Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/page_cycler/common/head.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/perf/page_cycler_test.cc
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index e07e36bbae65ede8bc8a55de7953d4cc90f495eb..31401eab8c910c826e20e9720e9ec4a147229580 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) { \
« no previous file with comments | « no previous file | tools/page_cycler/common/head.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698