summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 01:13:47 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-05 01:13:47 +0000
commita9588a1467dd8b214b6e85bbc5b35ce9824ea701 (patch)
treeb59db2f3ecf0df9e723a000b7468abbcbf683ca0
parent47eca73c749c184bf4723d204d89ee37e573f787 (diff)
downloadchromium_src-a9588a1467dd8b214b6e85bbc5b35ce9824ea701.zip
chromium_src-a9588a1467dd8b214b6e85bbc5b35ce9824ea701.tar.gz
chromium_src-a9588a1467dd8b214b6e85bbc5b35ce9824ea701.tar.bz2
Made it possible to override the name of tests in Telemetry test results.
This is needed in order to produce properly formatted gtest output. However, runtest.py isn't yet properly picking up the output from the WebGL conformance tests. Still investigating. BUG=225939 R=bajones@chromium.org, dtu@chromium.org Review URL: https://codereview.chromium.org/26070002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227163 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/test/gpu/gpu_tests/webgl_conformance.py2
-rw-r--r--tools/telemetry/telemetry/page/page_test_results.py12
2 files changed, 8 insertions, 6 deletions
diff --git a/content/test/gpu/gpu_tests/webgl_conformance.py b/content/test/gpu/gpu_tests/webgl_conformance.py
index 70e42f0..6fc8c89 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance.py
@@ -99,6 +99,8 @@ class WebglConformance(test_module.Test):
for test in tests:
pages.append({
+ 'name': 'WebglConformance.%s' %
+ test.replace('/', '_').replace('-', '_').rpartition('.')[0],
'url': 'file:///' + test,
'script_to_evaluate_on_commit': conformance_harness_script,
'navigate_steps': [
diff --git a/tools/telemetry/telemetry/page/page_test_results.py b/tools/telemetry/telemetry/page/page_test_results.py
index 5a2e6ff..23c7e72 100644
--- a/tools/telemetry/telemetry/page/page_test_results.py
+++ b/tools/telemetry/telemetry/page/page_test_results.py
@@ -26,22 +26,22 @@ class PageTestResults(unittest.TestResult):
self.skipped.append((test, reason))
def StartTest(self, page):
- self.startTest(page.url)
+ self.startTest(page.display_name)
def StopTest(self, page):
- self.stopTest(page.url)
+ self.stopTest(page.display_name)
def AddError(self, page, err):
- self.addError(page.url, err)
+ self.addError(page.display_name, err)
def AddFailure(self, page, err):
- self.addFailure(page.url, err)
+ self.addFailure(page.display_name, err)
def AddSuccess(self, page):
- self.addSuccess(page.url)
+ self.addSuccess(page.display_name)
def AddSkip(self, page, reason):
- self.addSkip(page.url, reason)
+ self.addSkip(page.display_name, reason)
def AddFailureMessage(self, page, message):
try: