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

Side by Side Diff: chrome/test/functional/media_stream_infobar.py

Issue 10957035: Adapted tests to API change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed video quality test, which will be coming up soon. Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import pyauto_functional 6 import pyauto_functional
7 import pyauto 7 import pyauto
8 import webrtc_test_base 8 import webrtc_test_base
9 9
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 self._TestGetUserMedia(with_action='allow')) 63 self._TestGetUserMedia(with_action='allow'))
64 self.assertEquals('failed-with-error-1', 64 self.assertEquals('failed-with-error-1',
65 self._TestGetUserMedia(with_action='dismiss')) 65 self._TestGetUserMedia(with_action='dismiss'))
66 66
67 def _TestGetUserMedia(self, with_action): 67 def _TestGetUserMedia(self, with_action):
68 """Runs getUserMedia in the test page and returns the result.""" 68 """Runs getUserMedia in the test page and returns the result."""
69 url = self.GetFileURLForDataPath('webrtc', 'webrtc_jsep00_test.html') 69 url = self.GetFileURLForDataPath('webrtc', 'webrtc_jsep00_test.html')
70 self.NavigateToURL(url) 70 self.NavigateToURL(url)
71 71
72 self.assertEquals('ok-requested', self.ExecuteJavascript( 72 self.assertEquals('ok-requested', self.ExecuteJavascript(
73 'getUserMedia(true, true, {})')) 73 'getUserMedia(true, true, "{}")'))
74 74
75 self.WaitForInfobarCount(1) 75 self.WaitForInfobarCount(1)
76 self.PerformActionOnInfobar(with_action, infobar_index=0) 76 self.PerformActionOnInfobar(with_action, infobar_index=0)
77 self.WaitForGetUserMediaResult(tab_index=0) 77 self.WaitForGetUserMediaResult(tab_index=0)
78 78
79 return self.GetUserMediaResult(tab_index=0) 79 return self.GetUserMediaResult(tab_index=0)
80 80
81 81
82 if __name__ == '__main__': 82 if __name__ == '__main__':
83 pyauto_functional.Main() 83 pyauto_functional.Main()
OLDNEW
« no previous file with comments | « chrome/test/data/webrtc/webrtc_video_quality_test.html ('k') | chrome/test/functional/webrtc_test_base.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698