Re-enable the DB perf tests and lower the number of iterations per...

chrome/test/page_cycler/page_cycler_test.cc

Index: chrome/test/page_cycler/page_cycler_test.cc
===================================================================
--- chrome/test/page_cycler/page_cycler_test.cc	(revision 42063)
+++ chrome/test/page_cycler/page_cycler_test.cc	(working copy)
@@ -29,9 +29,14 @@
 #endif
 
 #ifndef NDEBUG
-#define TEST_ITERATIONS "2"
+#define TEST_ITERATIONS 2
+#define DATABASE_TEST_ITERATIONS 2
 #else
-#define TEST_ITERATIONS "10"
+#define TEST_ITERATIONS 10
+// For some unknown reason, the DB perf tests are much much slower on the
+// Vista perf bot, so we have to cut down the number of iterations to 5
+// to make sure each test finishes in less than 10 minutes.
+#define DATABASE_TEST_ITERATIONS 5

[darin (slow to review), 2010/03/22 06:56:49]

won't this increase variance?  or is the variance level acceptable?  or maybe we
won't know until the tests have been running for a while?  have you considered
getting the buildbot changed to allow the test to run longer?

[darin (slow to review), 2010/03/22 22:21:01]

It would be good to at least file a bug about the vista perf bot and reference
that bug here.  It seems like we should try to understand the root cause of the
vista perf bot since the same issue could impact end users.

 #endif
 
 // URL at which data files may be found for HTTP tests.  The document root of
@@ -192,6 +197,10 @@
     return false;
   }
 
+  virtual int GetTestIterations() {
+    return TEST_ITERATIONS;
+  }
+
   // For HTTP tests, the name must be safe for use in a URL without escaping.
   void RunPageCycler(const char* name, std::wstring* pages,
                      std::string* timings, bool use_http) {
@@ -213,10 +222,11 @@
 
     // run N iterations
     GURL::Replacements replacements;
-    const char query_string[] = "iterations=" TEST_ITERATIONS "&auto=1";
+    const std::string query_string =
+        "iterations=" + IntToString(GetTestIterations()) + "&auto=1";
     replacements.SetQuery(
-        query_string,
-        url_parse::Component(0, arraysize(query_string) - 1));
+        query_string.c_str(),
+        url_parse::Component(0, query_string.length()));
     test_url = test_url.ReplaceComponents(replacements);
 
     scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -392,6 +402,10 @@
   virtual bool HasErrors(const std::string timings) {
     return HasDatabaseErrors(timings);
   }
+
+  virtual int GetTestIterations() {
+    return DATABASE_TEST_ITERATIONS;
+  }
 };
 
 class PageCyclerDatabaseReferenceTest : public PageCyclerReferenceTest {
@@ -407,6 +421,10 @@
   virtual bool HasErrors(const std::string timings) {
     return HasDatabaseErrors(timings);
   }
+
+  virtual int GetTestIterations() {
+    return DATABASE_TEST_ITERATIONS;
+  }
 };
 
 // This macro simplifies setting up regular and reference build tests.
@@ -420,13 +438,11 @@
 
 // This macro simplifies setting up regular and reference build tests
 // for HTML5 database tests.
-// TODO(dumi): re-enable the DB perf tests once we figure out why
-// they're so slow on the release perf bots
 #define PAGE_CYCLER_DATABASE_TESTS(test, name) \
-TEST_F(PageCyclerDatabaseTest, DISABLED_Database##name##File) { \
+TEST_F(PageCyclerDatabaseTest, Database##name##File) { \
   RunTest(test, test, false); \
 } \
-TEST_F(PageCyclerDatabaseReferenceTest, DISABLED_Database##name##File) { \
+TEST_F(PageCyclerDatabaseReferenceTest, Database##name##File) { \
   RunTest(test, test, false); \
 }