| 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 61765072206df13904a565c9dc91da0486f1333e..6e33b94922b8ec38fe7889c962bfd62e1bea41dc 100644
|
| --- a/tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| +++ b/tools/telemetry/telemetry/page/actions/seek_unittest.py
|
| @@ -21,8 +21,8 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| """Tests that with no selector Seek action seeks first media element."""
|
| data = {'wait_for_seeked': True, 'seek_time': 1}
|
| action = seek.SeekAction(data)
|
| - action.WillRunAction(None, self._tab)
|
| - action.RunAction(None, self._tab)
|
| + action.WillRunAction(self._tab)
|
| + action.RunAction(self._tab)
|
| # Assert only first video has played.
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
| @@ -31,11 +31,11 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| """Tests that Seek action seeks video element matching selector."""
|
| data = {'selector': '#video_1', 'wait_for_seeked': True, 'seek_time': 1}
|
| action = seek.SeekAction(data)
|
| - action.WillRunAction(None, self._tab)
|
| + action.WillRunAction(self._tab)
|
| # Both videos not playing before running action.
|
| self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
| - action.RunAction(None, self._tab)
|
| + action.RunAction(self._tab)
|
| # Assert only video matching selector has played.
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
| @@ -44,11 +44,11 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| """Tests that Seek action seeks all video elements with selector='all'."""
|
| data = {'selector': 'all', 'wait_for_seeked': True, 'seek_time': 1}
|
| action = seek.SeekAction(data)
|
| - action.WillRunAction(None, self._tab)
|
| + action.WillRunAction(self._tab)
|
| # Both videos not playing before running action.
|
| self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
| - action.RunAction(None, self._tab)
|
| + action.RunAction(self._tab)
|
| # Assert all media elements played.
|
| self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| self.assertTrue(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
|
| @@ -60,14 +60,14 @@ class SeekActionTest(tab_test_case.TabTestCase):
|
| 'wait_timeout': 1,
|
| 'seek_time': 1}
|
| action = seek.SeekAction(data)
|
| - action.WillRunAction(None, self._tab)
|
| + action.WillRunAction(self._tab)
|
| self._tab.EvaluateJavaScript('document.getElementById("video_1").src = ""')
|
| self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
|
| - self.assertRaises(util.TimeoutException, action.RunAction, None, self._tab)
|
| + self.assertRaises(util.TimeoutException, action.RunAction, self._tab)
|
|
|
| def testSeekWithoutSeekTime(self):
|
| """Tests that seek action fails with no seek time."""
|
| data = {'wait_for_seeked': True}
|
| action = seek.SeekAction(data)
|
| - action.WillRunAction(None, self._tab)
|
| - self.assertRaises(AssertionError, action.RunAction, None, self._tab)
|
| + action.WillRunAction(self._tab)
|
| + self.assertRaises(AssertionError, action.RunAction, self._tab)
|
|
|