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

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

Issue 12813013: [Telemetry] Cause web server to keep resources in memory and thread requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nduca comments Created 7 years, 9 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_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_unittest.py
diff --git a/tools/telemetry/telemetry/page/page_unittest.py b/tools/telemetry/telemetry/page/page_unittest.py
index 0ed6af558f50c920dda5ea249cec17cf1250ea5c..6af5898102297c850bdaf4dea12d010825744b74 100644
--- a/tools/telemetry/telemetry/page/page_unittest.py
+++ b/tools/telemetry/telemetry/page/page_unittest.py
@@ -10,25 +10,25 @@ class TestPage(unittest.TestCase):
apage = page.Page('file:///somedir/otherdir/file.html',
None, # In this test, we don't need a page set.
base_dir='basedir')
- dirname, filename = apage.url_base_dir_and_file
- self.assertEqual(dirname, 'basedir/somedir/otherdir')
+ serving_dirs, filename = apage.serving_dirs_and_file
+ self.assertEqual(serving_dirs, 'basedir/somedir/otherdir')
self.assertEqual(filename, 'file.html')
def testGetUrlBaseDirAndFileForRelativePath(self):
apage = page.Page('file:///../../otherdir/file.html',
None, # In this test, we don't need a page set.
base_dir='basedir')
- dirname, filename = apage.url_base_dir_and_file
- self.assertEqual(dirname, 'basedir/../../otherdir')
+ serving_dirs, filename = apage.serving_dirs_and_file
+ self.assertEqual(serving_dirs, 'basedir/../../otherdir')
self.assertEqual(filename, 'file.html')
def testGetUrlBaseDirAndFileForUrlBaseDir(self):
apage = page.Page('file:///../../somedir/otherdir/file.html',
None, # In this test, we don't need a page set.
base_dir='basedir')
- setattr(apage, 'url_base_dir', 'file:///../../somedir/')
- dirname, filename = apage.url_base_dir_and_file
- self.assertEqual(dirname, 'basedir/../../somedir/')
+ setattr(apage, 'serving_dirs', ['../../somedir/'])
+ serving_dirs, filename = apage.serving_dirs_and_file
+ self.assertEqual(serving_dirs, ['basedir/../../somedir/'])
self.assertEqual(filename, 'otherdir/file.html')
def testDisplayUrlForHttp(self):
« no previous file with comments | « tools/telemetry/telemetry/page/page_runner.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698