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

Unified Diff: tools/telemetry/telemetry/page/actions/play_unittest.py

Issue 186593007: Remove href_change and navigate from wait action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « tools/telemetry/telemetry/page/actions/play.py ('k') | tools/telemetry/telemetry/page/actions/reload.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/actions/play_unittest.py
diff --git a/tools/telemetry/telemetry/page/actions/play_unittest.py b/tools/telemetry/telemetry/page/actions/play_unittest.py
index 947630c343fef4772feb3356d71eb3c06f509fc6..6f4f747850cfcbbbb73250e17966e7c6356356fd 100644
--- a/tools/telemetry/telemetry/page/actions/play_unittest.py
+++ b/tools/telemetry/telemetry/page/actions/play_unittest.py
@@ -25,7 +25,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Both videos not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
- action.RunAction(None, self._tab, None)
+ action.RunAction(None, self._tab)
# Assert only first video has played.
self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
@@ -38,7 +38,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Both videos not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
- action.RunAction(None, self._tab, None)
+ action.RunAction(None, self._tab)
# Assert only video matching selector has played.
self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
@@ -51,7 +51,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Both videos not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
- action.RunAction(None, self._tab, None)
+ action.RunAction(None, self._tab)
# Assert all media elements played.
self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertTrue(self._tab.EvaluateJavaScript(AUDIO_1_PLAYING_CHECK))
@@ -66,8 +66,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
action.WillRunAction(None, self._tab)
self._tab.EvaluateJavaScript('document.getElementById("video_1").src = ""')
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
- self.assertRaises(util.TimeoutException, action.RunAction, None, self._tab,
- None)
+ self.assertRaises(util.TimeoutException, action.RunAction, None, self._tab)
def testPlayWaitForEnded(self):
"""Tests that wait_for_ended waits for video to end."""
@@ -77,7 +76,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Assert video not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
- action.RunAction(None, self._tab, None)
+ action.RunAction(None, self._tab)
# Assert video ended.
self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
@@ -89,7 +88,7 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Assert video not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
- action.RunAction(None, self._tab, None)
+ action.RunAction(None, self._tab)
# Assert video did not end.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
@@ -101,7 +100,6 @@ class PlayActionTest(tab_test_case.TabTestCase):
# Assert video not playing before running action.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_PLAYING_CHECK))
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
- self.assertRaises(util.TimeoutException, action.RunAction, None, self._tab,
- None)
+ self.assertRaises(util.TimeoutException, action.RunAction, None, self._tab)
# Assert video did not end.
self.assertFalse(self._tab.EvaluateJavaScript(VIDEO_1_ENDED_CHECK))
« no previous file with comments | « tools/telemetry/telemetry/page/actions/play.py ('k') | tools/telemetry/telemetry/page/actions/reload.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698