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

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

Issue 802403002: [Telemetry] Fix file naming issue causing page_run_end_to_end tests to never run. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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_run_end_to_end_tests.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_run_end_to_end_unittest.py
diff --git a/tools/telemetry/telemetry/page/page_run_end_to_end_tests.py b/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py
similarity index 99%
rename from tools/telemetry/telemetry/page/page_run_end_to_end_tests.py
rename to tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py
index 0aad2c45d3484c534b964415a5d60d8d5f4a4dc5..0425e3e6dc549c3667b99ebda8ff85297a1e7df7 100644
--- a/tools/telemetry/telemetry/page/page_run_end_to_end_tests.py
+++ b/tools/telemetry/telemetry/page/page_run_end_to_end_unittest.py
@@ -307,8 +307,8 @@ class PageRunEndToEndTests(unittest.TestCase):
expectations = test_expectations.TestExpectations()
expectations = test_expectations.TestExpectations()
page = page_module.Page(
- 'file://blank.html', ps, base_dir=util.GetUnittestDataDir())
- page.startup_url = 'about:blank'
+ 'file://blank.html', ps, base_dir=util.GetUnittestDataDir(),
+ startup_url='about:blank')
ps.pages.append(page)
class Measurement(page_test.PageTest):
@@ -350,7 +350,7 @@ class PageRunEndToEndTests(unittest.TestCase):
self.did_call_clean_up = False
def ValidateAndMeasurePage(self, *_):
- raise exceptions.IntentionalException
+ raise page_test.Failure
def CleanUpAfterPage(self, page, tab):
self.did_call_clean_up = True
@@ -414,7 +414,7 @@ class PageRunEndToEndTests(unittest.TestCase):
def RunNavigateSteps(self, action_runner): # pylint: disable=W0613
self.was_run = True
- raise Exception('Test exception')
+ raise page_test.Failure
class Test(page_test.PageTest):
def ValidateAndMeasurePage(self, *args):
« no previous file with comments | « tools/telemetry/telemetry/page/page_run_end_to_end_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698