Fixed race condition in test. Fixed spurious wait requests on shutdown.

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 pyauto_functional
 import pyauto
@@ skipping 38 matching lines @@
         'peerconnection_server binary next to the chrome binary.')
 
     self._server_process = subprocess.Popen(binary_path)
 
   def tearDown(self):
     self._server_process.kill()
 
     pyauto.PyUITest.tearDown(self)
     self.assertEquals('', self.CheckErrorsAndCrashes())
 
-  def _SimpleWebRtcCall(self, test_page):
+  def _SimpleWebrtcCall(self, test_page):
     """Tests we can call and hang up with WebRTC.
 
     This test exercises pretty much the whole happy-case for the WebRTC
     JavaScript API. Currently, it exercises a normal call setup using the API
     defined at http://dev.w3.org/2011/webrtc/editor/webrtc.html. The API is
     still evolving.
 
     The test will load the supplied HTML file, which in turn will load different
     javascript files depending on which version of the signaling protocol
     we are running.
@@ skipping 18 matching lines @@
     self._Connect('user_2', tab_index=1)
 
     self._EstablishCall(from_tab_with_index=0)
 
     self._StartDetectingVideo(tab_index=0, video_element='remote_view')
 
     self._WaitForVideoToPlay()
 
     # The hang-up will automatically propagate to the second tab.
     self._HangUp(from_tab_with_index=0)
-    self._VerifyHungUp(tab_index=1)
+    self._WaitUntilHangUpVerified(tab_index=1)
 
     self._Disconnect(tab_index=0)
     self._Disconnect(tab_index=1)
 
     # Ensure we didn't miss any errors.
     self.AssertNoFailures(tab_index=0)
     self.AssertNoFailures(tab_index=1)
 
-  def testSimpleWebRtcJsepCall(self):
-    self._SimpleWebRtcCall('webrtc_jsep_test.html')
+  def testSimpleWebrtcJsepCall(self):
+    self._SimpleWebrtcCall('webrtc_jsep_test.html')
 
   def testLocalPreview(self):
     """Brings up a local preview and ensures video is playing.
 
     This test will launch a window with a single tab and run a getUserMedia call
     which will give us access to the webcam and microphone. Then the javascript
     code will hook up the webcam data to the local_view video tag. We will
     detect video in that tag using the video detector, and if we see video
     moving the test passes.
     """
@@ skipping 33 matching lines @@
         'call()', tab_index=from_tab_with_index))
     self.AssertNoFailures(from_tab_with_index)
 
     # Double-check the call reached the other side.
     self.assertEquals('yes', self.ExecuteJavascript(
         'is_call_active()', tab_index=from_tab_with_index))
 
   def _HangUp(self, from_tab_with_index):
     self.assertEquals('ok-call-hung-up', self.ExecuteJavascript(
         'hangUp()', tab_index=from_tab_with_index))
-    self._VerifyHungUp(from_tab_with_index)
-    self.AssertNoFailures(from_tab_with_index)
+    self._WaitUntilHangUpVerified(tab_index=from_tab_with_index)
+    self.AssertNoFailures(tab_index=from_tab_with_index)
 
-  def _VerifyHungUp(self, tab_index):
-    self.assertEquals('no', self.ExecuteJavascript(
-        'is_call_active()', tab_index=tab_index))
+  def _WaitUntilHangUpVerified(self, tab_index):
+    hung_up = self.WaitUntil(
+        function=lambda: self.ExecuteJavascript('is_call_active()',
+                                                tab_index=tab_index),
+        expect_retval='no')
+    self.assertTrue(hung_up,
+                    msg='Timed out while waiting for hang-up to be confirmed.')
 
   def _Disconnect(self, tab_index):
     self.assertEquals('ok-disconnected', self.ExecuteJavascript(
         'disconnect()', 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.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()