summaryrefslogtreecommitdiffstats
path: root/tools/telemetry
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 19:14:53 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 19:14:53 +0000
commitf9b662bbdaa4730d0039c3d56fe6fe920302cecb (patch)
tree8315ba84c69131842170e8cc51d8bf5444005b8d /tools/telemetry
parent971579ce9f879b72ad628188dbe094cf2eeccab9 (diff)
downloadchromium_src-f9b662bbdaa4730d0039c3d56fe6fe920302cecb.zip
chromium_src-f9b662bbdaa4730d0039c3d56fe6fe920302cecb.tar.gz
chromium_src-f9b662bbdaa4730d0039c3d56fe6fe920302cecb.tar.bz2
[Telemetry] Make the display_url for file:// URLs more sane.
This fixes the perf results output for the image_decoding_benchmark. BUG=163680 TEST=tools/telemetry/run_tests telemetry.page_unittest Review URL: https://codereview.chromium.org/11446069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
-rw-r--r--tools/telemetry/telemetry/page.py2
-rw-r--r--tools/telemetry/telemetry/page_unittest.py8
2 files changed, 10 insertions, 0 deletions
diff --git a/tools/telemetry/telemetry/page.py b/tools/telemetry/telemetry/page.py
index 03b3807..0be70dc 100644
--- a/tools/telemetry/telemetry/page.py
+++ b/tools/telemetry/telemetry/page.py
@@ -52,6 +52,8 @@ class Page(object):
@property
def display_url(self):
+ if self.url.startswith('file://'):
+ return os.path.split(self.url)[1]
return re.sub('https?://', '', self.url)
def __str__(self):
diff --git a/tools/telemetry/telemetry/page_unittest.py b/tools/telemetry/telemetry/page_unittest.py
index 049e5be..21b0a67 100644
--- a/tools/telemetry/telemetry/page_unittest.py
+++ b/tools/telemetry/telemetry/page_unittest.py
@@ -27,3 +27,11 @@ class TestPage(unittest.TestCase):
dirname, filename = apage.url_base_dir_and_file
self.assertEqual(dirname, 'basedir/../../somedir/')
self.assertEqual(filename, 'otherdir/file.html')
+
+ def testDisplayUrlForHttp(self):
+ self.assertEquals(page.Page('http://www.foo.com/').display_url,
+ 'www.foo.com/')
+
+ def testDisplayUrlForFile(self):
+ self.assertEquals(page.Page('file:///../../otherdir/file.html').display_url,
+ 'file.html')