[telemetry] Number the trace .json files in trace-dir.

tools/telemetry/telemetry/page_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import logging
 import os
 import time
 import traceback
 import urlparse
 import random
 
@@ skipping 31 matching lines @@
   if options.test_shuffle_order_file and not options.test_shuffle:
     raise Exception('--test-shuffle-order-file requires --test-shuffle.')
 
   if options.test_shuffle_order_file:
     return page_set.ReorderPageSet(options.test_shuffle_order_file)
 
   pages = page_set.pages[:]
   if options.test_shuffle:
     random.Random().shuffle(pages)
   return [page
-      for _ in xrange(options.pageset_repeat)
+      for _ in xrange(int(options.pageset_repeat))
       for page in pages
-      for _ in xrange(options.page_repeat)]
+      for _ in xrange(int(options.page_repeat))]
 
 class PageRunner(object):
   """Runs a given test against a given test."""
   def __init__(self, page_set):
     self.page_set = page_set
 
   def __enter__(self):
     return self
 
   def __exit__(self, *args):
@@ skipping 26 matching lines @@
         credentials_path = None
 
     # Set up user agent.
     if self.page_set.user_agent_type:
       options.browser_user_agent_type = self.page_set.user_agent_type
 
     for page in self.page_set:
       test.CustomizeBrowserOptionsForPage(page, possible_browser.options)
 
     # Check tracing directory.
-    if options.trace_dir and not os.path.isdir(options.trace_dir):
-      raise Exception('Trace directory doesn\'t exist: %s' % options.trace_dir)
+    if options.trace_dir:
+      if not os.path.isdir(options.trace_dir):
+        raise Exception('Trace directory doesn\'t exist: %s' %
+                        options.trace_dir)
+      elif os.listdir(options.trace_dir):
+        raise Exception('Trace directory isn\'t empty: %s' % options.trace_dir)
 
     # Reorder page set based on options.
     pages = _ShufflePageSet(self.page_set, options)
 
     state = _RunState()
     try:
       for page in pages:
         # Set up browser.
         if not state.browser:
           assert not state.tab
@@ skipping 40 matching lines @@
         if options.trace_dir and state.trace_tab:
           def IsTracingRunning():
             return state.trace_tab.runtime.Evaluate(
                 'tracingController.isTracingEnabled')
           # Tracing might have ended already if the buffer filled up.
           if IsTracingRunning():
             state.trace_tab.runtime.Execute('tracingController.endTracing()')
           util.WaitFor(lambda: not IsTracingRunning(), 10)
 
           logging.info('Processing trace...')
-          with open(os.path.join(options.trace_dir, page.url_as_file_safe_name +
-              '.json'), 'w') as trace_file:
+
+          trace_file_base = os.path.join(
+              options.trace_dir, page.url_as_file_safe_name)
+
+          if options.page_repeat != 1 or options.pageset_repeat != 1:
+            trace_file_index = 0
+
+            while True:
+              trace_file = "%s_%03d.json" % (trace_file_base, trace_file_index)

[dtu, 2012/12/01 01:22:14]

Single quotes. Below too.

+              if not os.path.exists(trace_file):
+                break
+              trace_file_index = trace_file_index + 1
+          else:
+            trace_file = "%s.json" % trace_file_base
+
+          with open(trace_file, 'w') as trace_file:
             trace_file.write(state.trace_tab.runtime.Evaluate("""
               JSON.stringify({
                 traceEvents: tracingController.traceEvents,
                 systemTraceEvents: tracingController.systemTraceEvents,
                 clientInfo: tracingController.clientInfo_,
                 gpuInfo: tracingController.gpuInfo_
               });
             """))
           logging.info('Trace saved.')
     finally:
@@ skipping 91 matching lines @@
       self.WaitForPageToLoad(page.wait_for_javascript_expression, tab)
 
     tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
     return True
 
   def _CleanUpPage(self, page, tab, page_state): # pylint: disable=R0201
     if page.credentials and page_state.did_login:
       tab.browser.credentials.LoginNoLongerNeeded(tab, page.credentials)
     tab.runtime.Evaluate("""window.chrome && chrome.benchmarking &&
                             chrome.benchmarking.closeConnections()""")