Fixed race condition in media_stream_infobar.py.

chrome/test/functional/webrtc_call.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import subprocess
-import time
-import unittest
 
 import pyauto_functional
 import pyauto
-
+import webrtc_test_base
 
 class MissingRequiredBinaryException(Exception):
   pass
 
 
-class WebRTCCallTest(pyauto.PyUITest):
+class WebRTCCallTest(webrtc_test_base.WebrtcTestBase):
   """Test we can set up a WebRTC call and disconnect it.
 
   Prerequisites: This test case must run on a machine with a webcam, either
   fake or real, and with some kind of audio device. You must make the
   peerconnection_server target before you run.
 
   The test case will launch a custom binary
   (peerconnection_server) which will allow two WebRTC clients to find each
   other. For more details, see the source code which is available at the site
   http://code.google.com/p/libjingle/source/browse/ (make sure to browse to
@@ skipping 112 matching lines @@
     self.assertEquals('failed-with-error-1',
                       self._GetUserMedia(tab_index=0, action='dismiss'))
 
   def _GetUserMedia(self, tab_index, action='allow'):
     """Acquires webcam or mic for one tab and returns the result."""
     self.assertEquals('ok-requested', self.ExecuteJavascript(
         'getUserMedia(true, true)', tab_index=tab_index))
 
     self.WaitForInfobarCount(1, tab_index=tab_index)
     self.PerformActionOnInfobar(action, infobar_index=0, tab_index=tab_index)
-    self._WaitForGetUserMediaResult(tab_index=0)
+    self.WaitForGetUserMediaResult(tab_index=0)
 
-    result = self._GetUserMediaResult(tab_index=0)
+    result = self.GetUserMediaResult(tab_index=0)
     self._AssertNoFailures(tab_index)
     return result
 
   def _Connect(self, user_name, tab_index):
     self.assertEquals('ok-connected', self.ExecuteJavascript(
         'connect("http://localhost:8888", "%s")' % user_name,
         tab_index=tab_index))
     self._AssertNoFailures(tab_index)
 
   def _EstablishCall(self, from_tab_with_index):
@@ skipping 12 matching lines @@
     self._AssertNoFailures(from_tab_with_index)
 
   def _VerifyHungUp(self, tab_index):
     self.assertEquals('no', self.ExecuteJavascript(
         'is_call_active()', tab_index=tab_index))
 
   def _Disconnect(self, tab_index):
     self.assertEquals('ok-disconnected', self.ExecuteJavascript(
         'disconnect()', tab_index=tab_index))
 
-  def _WaitForGetUserMediaResult(self, tab_index):
-    def HasResult():
-      return self._GetUserMediaResult(tab_index) != 'not-called-yet'
-    self.assertTrue(self.WaitUntil(HasResult),
-                    msg='Timed out while waiting for getUserMedia callback.')
-
-  def _GetUserMediaResult(self, tab_index):
-    return self.ExecuteJavascript(
-        'obtainGetUserMediaResult()', tab_index=tab_index)
-
   def _StartDetectingVideo(self, tab_index, video_element):
     self.assertEquals('ok-started', self.ExecuteJavascript(
         'startDetection("%s", "frame_buffer", 320, 240)' % video_element,
         tab_index=tab_index));
 
   def _WaitForVideoToPlay(self):
     video_playing = self.WaitUntil(
         function=lambda: self.ExecuteJavascript('isVideoPlaying()'),
         expect_retval='video-playing')
     self.assertTrue(video_playing,
                     msg='Timed out while trying to detect video.')
 
   def _AssertNoFailures(self, tab_index):
     self.assertEquals('ok-no-errors', self.ExecuteJavascript(
         'getAnyTestFailures()', tab_index=tab_index))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()