| Index: tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| diff --git a/tools/telemetry/telemetry/page/actions/seek_unittest.py b/tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| index c273cacc1fdfe2474e2d17dab3a1604b5d757349..fd021f03824b05e0d7c85cd8397fbc9108d71200 100644
|
| --- a/tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| +++ b/tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| @@ -5,7 +5,6 @@
|
| from telemetry.core import util
|
| from telemetry.page.actions import seek
|
| from telemetry.unittest import tab_test_case
|
| -from telemetry.unittest import test
|
|
|
|
|
| AUDIO_1_SEEKED_CHECK = 'window.__hasEventCompleted("#audio_1", "seeked");'
|
| @@ -16,11 +15,8 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
|
|
| def setUp(self):
|
| tab_test_case.TabTestCase.setUp(self)
|
| - self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
|
| - self._tab.Navigate(self._browser.http_server.UrlOf('video_test.html'))
|
| - self._tab.WaitForDocumentReadyStateToBeComplete()
|
| + self.Navigate('video_test.html')
|
|
|
| - @test.Disabled('chromeos')
|
| def testSeekWithNoSelector(self):
|
| """Tests that with no selector Seek action seeks first media element."""
|
| data = {'wait_for_seeked': True, 'seek_time': 1}
|
| @@ -31,7 +27,6 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
|
|
| - @test.Disabled('chromeos')
|
| def testSeekWithVideoSelector(self):
|
| """Tests that Seek action seeks video element matching selector."""
|
| data = {'selector': '#video_1', 'wait_for_seeked': True, 'seek_time': 1}
|
| @@ -45,7 +40,6 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
|
|
| - @test.Disabled('chromeos')
|
| def testSeekWithAllSelector(self):
|
| """Tests that Seek action seeks all video elements with selector='all'."""
|
| data = {'selector': 'all', 'wait_for_seeked': True, 'seek_time': 1}
|
| @@ -59,7 +53,6 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertTrue(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
|
|
| - @test.Disabled('chromeos') # http://crbug.com/273887
|
| def testSeekWaitForSeekTimeout(self):
|
| """Tests that wait_for_seeked timeouts if video does not seek."""
|
| data = {'selector': '#video_1',
|
|
|