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

Unified Diff: tools/telemetry/telemetry/page/page_test_runner.py

Issue 14359012: Telemetry: Add option to create a dirty profile as part of a test run (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix to unit tests Created 7 years, 7 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 | « tools/telemetry/telemetry/page/page_measurement_runner.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/page_test_runner.py
diff --git a/tools/telemetry/telemetry/page/page_test_runner.py b/tools/telemetry/telemetry/page/page_test_runner.py
index b112dae127f2320f3ec38499719673ed183440b1..2ce13d621203e0cdb031dddc31cf65d5d37e75ac 100644
--- a/tools/telemetry/telemetry/page/page_test_runner.py
+++ b/tools/telemetry/telemetry/page/page_test_runner.py
@@ -7,20 +7,22 @@ import sys
from telemetry.core import browser_finder
from telemetry.core import browser_options
+from telemetry.core import profile_types
from telemetry.page import page_test
from telemetry.page import page_test_results
from telemetry.page import page_runner
from telemetry.page import page_set
from telemetry.test import discover
-def Main(test_dir, page_set_filenames):
+def Main(test_dir, profile_creators_dir, page_set_filenames):
"""Turns a PageTest into a command-line program.
Args:
test_dir: Path to directory containing PageTests.
+ profile_creators_dir: Path to a directory containing ProfileCreators
"""
runner = PageTestRunner()
- sys.exit(runner.Run(test_dir, page_set_filenames))
+ sys.exit(runner.Run(test_dir, profile_creators_dir, page_set_filenames))
class PageTestRunner(object):
def __init__(self):
@@ -39,8 +41,9 @@ class PageTestRunner(object):
def test_class_name(self):
return 'test'
- def Run(self, test_dir, page_set_filenames):
- test, ps = self.ParseCommandLine(sys.argv, test_dir, page_set_filenames)
+ def Run(self, test_dir, profile_creators_dir, page_set_filenames):
+ test, ps = self.ParseCommandLine(
+ sys.argv, test_dir, profile_creators_dir, page_set_filenames)
results = self.PrepareResults(test)
self.RunTestOnPageSet(test, ps, results)
return self.OutputResults(results)
@@ -118,7 +121,12 @@ class PageTestRunner(object):
raise Exception('Did not understand "%s". Pass a page set, file or URL.' %
page_set_arg)
- def ParseCommandLine(self, args, test_dir, page_set_filenames):
+ def ParseCommandLine(self, args, test_dir, profile_creators_dir,
+ page_set_filenames):
+ # Need to collect profile creators before creating command line parser.
+ if profile_creators_dir:
+ profile_types.FindProfileCreators(profile_creators_dir)
+
self._options = browser_options.BrowserOptions()
self._parser = self._options.CreateParser(
'%%prog [options] %s page_set' % self.test_class_name)
« no previous file with comments | « tools/telemetry/telemetry/page/page_measurement_runner.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698