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

Unified Diff: tools/telemetry/telemetry/core/tab_unittest.py

Issue 469593002: [telemetry] Create BrowserTestCase to reuse the browser for browser_unittest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update page_test_test_case references in tools/perf/ Created 6 years, 4 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/tab_unittest.py
diff --git a/tools/telemetry/telemetry/core/tab_unittest.py b/tools/telemetry/telemetry/core/tab_unittest.py
index c4e953ffe98d86648c24b5dd83a57f5bc016b77d..2f5cb694fd2dce479096443caac086777ffffc39 100644
--- a/tools/telemetry/telemetry/core/tab_unittest.py
+++ b/tools/telemetry/telemetry/core/tab_unittest.py
@@ -48,14 +48,12 @@ class FakePlatform(object):
class TabTest(tab_test_case.TabTestCase):
- def testNavigateAndWaitToForCompleteState(self):
- self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
- self._tab.Navigate(self._browser.http_server.UrlOf('blank.html'))
+ def testNavigateAndWaitForCompleteState(self):
+ self._tab.Navigate(self.UrlOfUnittestFile('blank.html'))
self._tab.WaitForDocumentReadyStateToBeComplete()
- def testNavigateAndWaitToForInteractiveState(self):
- self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
- self._tab.Navigate(self._browser.http_server.UrlOf('blank.html'))
+ def testNavigateAndWaitForInteractiveState(self):
+ self._tab.Navigate(self.UrlOfUnittestFile('blank.html'))
self._tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
def testTabBrowserIsRightBrowser(self):
@@ -79,8 +77,9 @@ class TabTest(tab_test_case.TabTestCase):
def testTabUrl(self):
self.assertEquals(self._tab.url, 'about:blank')
- self.Navigate('blank.html')
- self.assertEquals(self._tab.url, self.test_url)
+ url = self.UrlOfUnittestFile('blank.html')
+ self._tab.Navigate(url)
+ self.assertEquals(self._tab.url, url)
def testIsTimelineRecordingRunningTab(self):
self.assertFalse(self._tab.is_timeline_recording_running)
@@ -164,9 +163,8 @@ class TabTest(tab_test_case.TabTestCase):
class GpuTabTest(tab_test_case.TabTestCase):
@classmethod
- def setUpClass(cls):
- cls._extra_browser_args = ['--enable-gpu-benchmarking']
- super(GpuTabTest, cls).setUpClass()
+ def CustomizeBrowserOptions(cls, options):
+ options.AppendExtraBrowserArgs('--enable-gpu-benchmarking')
# Test flaky on mac: http://crbug.com/358664
@benchmark.Disabled('android', 'mac')

Powered by Google App Engine
This is Rietveld 408576698