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

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

Issue 12088107: Revert 180117, it broke all telemetry tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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_set_unittest.py ('k') | tools/telemetry/telemetry/record_wpr.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page_unittest.py
===================================================================
--- tools/telemetry/telemetry/page_unittest.py (revision 180130)
+++ tools/telemetry/telemetry/page_unittest.py (working copy)
@@ -8,7 +8,6 @@
class TestPage(unittest.TestCase):
def testGetUrlBaseDirAndFileForAbsolutePath(self):
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')
@@ -16,7 +15,6 @@
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')
@@ -24,7 +22,6 @@
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
@@ -32,10 +29,9 @@
self.assertEqual(filename, 'otherdir/file.html')
def testDisplayUrlForHttp(self):
- self.assertEquals(page.Page('http://www.foo.com/', None).display_url,
+ self.assertEquals(page.Page('http://www.foo.com/').display_url,
'www.foo.com/')
def testDisplayUrlForFile(self):
- self.assertEquals(
- page.Page('file:///../../otherdir/file.html', None).display_url,
- 'file.html')
+ self.assertEquals(page.Page('file:///../../otherdir/file.html').display_url,
+ 'file.html')
« no previous file with comments | « tools/telemetry/telemetry/page_set_unittest.py ('k') | tools/telemetry/telemetry/record_wpr.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698