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

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

Issue 24451002: [telemetry] Support absolute paths by changing file:/// to file://. More robust file path handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test on mac, apparently /tmp is a symlink to /private/tmp Created 7 years, 2 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_set.py ('k') | tools/telemetry/telemetry/page/page_test_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/page_set_unittest.py
diff --git a/tools/telemetry/telemetry/page/page_set_unittest.py b/tools/telemetry/telemetry/page/page_set_unittest.py
index fdb2f0571aca16f5e72574fb7b91dde70ea7bafd..3a55651098fe08c923063f2923f49fde83c656c8 100644
--- a/tools/telemetry/telemetry/page/page_set_unittest.py
+++ b/tools/telemetry/telemetry/page/page_set_unittest.py
@@ -1,12 +1,14 @@
# 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 os
import tempfile
import unittest
from telemetry.page import page_set
+
simple_archive_info = """
{
"archives": {
@@ -16,6 +18,7 @@ simple_archive_info = """
}
"""
+
simple_set = """
{"description": "hello",
"archive_data_file": "%s",
@@ -26,6 +29,7 @@ simple_set = """
}
"""
+
class TestPageSet(unittest.TestCase):
def testSimpleSet(self):
try:
@@ -48,12 +52,22 @@ class TestPageSet(unittest.TestCase):
self.assertEquals('data_01.wpr', os.path.basename(ps.pages[0].archive_path))
self.assertEquals('data_02.wpr', os.path.basename(ps.pages[1].archive_path))
- def testDirectoryFilePath(self):
+ def testServingDirs(self):
directory_path = tempfile.mkdtemp()
try:
- ps = page_set.PageSet.FromDict({'pages': [{'url': 'file:///test.html'}]},
- directory_path)
+ ps = page_set.PageSet.FromDict({
+ 'serving_dirs': ['a/b'],
+ 'pages': [
+ {'url': 'file://c/test.html'},
+ {'url': 'file://c/test.js'},
+ {'url': 'file://d/e/../test.html'},
+ ]
+ }, directory_path)
finally:
os.rmdir(directory_path)
- self.assertEquals(ps[0].base_dir, directory_path)
+ real_directory_path = os.path.realpath(directory_path)
+ expected_serving_dirs = set([os.path.join(real_directory_path, 'a', 'b')])
+ self.assertEquals(ps.serving_dirs, expected_serving_dirs)
+ self.assertEquals(ps[0].serving_dir, os.path.join(real_directory_path, 'c'))
+ self.assertEquals(ps[2].serving_dir, os.path.join(real_directory_path, 'd'))
« no previous file with comments | « tools/telemetry/telemetry/page/page_set.py ('k') | tools/telemetry/telemetry/page/page_test_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698