In endure benchmark: change perf_stats_interval to string.

BUG=306968

Review URL: https://codereview.chromium.org/27229003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228584 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 61 deletions

diff --git a/tools/perf/benchmarks/endure.py b/tools/perf/benchmarks/endure.py
index 9c27693a..c222308 100644
--- a/tools/perf/benchmarks/endure.py
+++ b/tools/perf/benchmarks/endure.py
@@ -7,91 +7,44 @@ from telemetry import test
 from measurements import endure
 
 
-class EndureCalendarForwardBackward(test.Test):
+class _EndureBenchmark(test.Test):
   test = endure.Endure
-  page_set = 'page_sets/calendar_forward_backward.json'
+  # Default options for endure benchmarks. Could be overridden in subclasses.
   options = {
       'output_format': 'csv',
       'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
+      'page_repeat_secs': 7200,
+      'perf_stats_interval': '100s'
   }
 
+class EndureCalendarForwardBackward(_EndureBenchmark):
+  page_set = 'page_sets/calendar_forward_backward.json'
 
-class EndureBrowserControl(test.Test):
-  test = endure.Endure
+
+class EndureBrowserControl(_EndureBenchmark):
   page_set = 'page_sets/browser_control.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-class EndureBrowserControlClick(test.Test):
-  test = endure.Endure
+class EndureBrowserControlClick(_EndureBenchmark):
   page_set = 'page_sets/browser_control_click.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-
-class EndureGmailAltThreadlistConversation(test.Test):
-  test = endure.Endure
+class EndureGmailAltThreadlistConversation(_EndureBenchmark):
   page_set = 'page_sets/gmail_alt_threadlist_conversation.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-class EndureGmailAltTwoLabels(test.Test):
-  test = endure.Endure
+class EndureGmailAltTwoLabels(_EndureBenchmark):
   page_set = 'page_sets/gmail_alt_two_labels.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-class EndureGmailExpandCollapseConversation(test.Test):
-  test = endure.Endure
+class EndureGmailExpandCollapseConversation(_EndureBenchmark):
   page_set = 'page_sets/gmail_expand_collapse_conversation.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-class EndureIndexedDBOffline(test.Test):
-  test = endure.Endure
+class EndureIndexedDBOffline(_EndureBenchmark):
   page_set = 'page_sets/indexeddb_offline.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }
 
 
-class EndurePlusAltPostsPhotos(test.Test):
-  test = endure.Endure
+class EndurePlusAltPostsPhotos(_EndureBenchmark):
   page_set = 'page_sets/plus_alt_posts_photos.json'
-  options = {
-      'output_format': 'csv',
-      'skip_navigate_on_repeat': True,
-      'page_repeat_secs': 3600,
-      'perf_stats_interval': 30
-  }