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

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py

Issue 151003003: Fix navigation to unittest files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert changes in memory_cache_http_unittest.py Created 6 years, 10 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
Index: tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py
index 9d9cdbc5a799ea812a87436ec39c96cdfd3aed57..0343920432f43872c39b77a5efd4cf50136ab279 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/inspector_page_unittest.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from telemetry import test
-from telemetry.core import util
from telemetry.unittest import tab_test_case
@@ -13,17 +11,12 @@ class InspectorPageTest(tab_test_case.TabTestCase):
def setUp(self):
super(InspectorPageTest, self).setUp()
- self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
def testPageNavigateToNormalUrl(self):
- self._tab.Navigate(self._browser.http_server.UrlOf('blank.html'))
- self._tab.WaitForDocumentReadyStateToBeComplete()
+ self.Navigate('blank.html')
- @test.Disabled('chromeos')
def testCustomActionToNavigate(self):
- self._tab.Navigate(
- self._browser.http_server.UrlOf('page_with_link.html'))
- self._tab.WaitForDocumentReadyStateToBeComplete()
+ self.Navigate('page_with_link.html')
self.assertEquals(
self._tab.EvaluateJavaScript('document.location.pathname;'),
'/page_with_link.html')
@@ -41,15 +34,12 @@ class InspectorPageTest(tab_test_case.TabTestCase):
'/blank.html')
def testGetCookieByName(self):
- self._tab.Navigate(
- self._browser.http_server.UrlOf('blank.html'))
- self._tab.WaitForDocumentReadyStateToBeComplete()
+ self.Navigate('blank.html')
self._tab.ExecuteJavaScript('document.cookie="foo=bar"')
self.assertEquals(self._tab.GetCookieByName('foo'), 'bar')
def testScriptToEvaluateOnCommit(self):
- self._tab.Navigate(
- self._browser.http_server.UrlOf('blank.html'),
- script_to_evaluate_on_commit='var foo = "bar";')
+ self.Navigate('blank.html',
+ script_to_evaluate_on_commit='var foo = "bar";')
self._tab.WaitForDocumentReadyStateToBeComplete()
self.assertEquals(self._tab.EvaluateJavaScript('foo'), 'bar')

Powered by Google App Engine
This is Rietveld 408576698