Bug 1126199 - Enable remote video status checking in Loop's functional test. r=dmose NPOTB DONTBUILD
authorMark Banner <standard8@mozilla.com>
Wed, 28 Jan 2015 08:46:44 +0000
changeset 239603 30f5081b32007f243e2483db4e11cfcaaad4b939
parent 239602 27a7220c099b298f172c848a20fee9962829905c
child 239604 9352849eaade01855be64c384a2e091ee69d4e6f
push id500
push userjoshua.m.grant@gmail.com
push dateThu, 29 Jan 2015 01:48:36 +0000
reviewersdmose
bugs1126199
milestone38.0a1
Bug 1126199 - Enable remote video status checking in Loop's functional test. r=dmose NPOTB DONTBUILD
browser/components/loop/test/functional/test_1_browser_call.py
--- a/browser/components/loop/test/functional/test_1_browser_call.py
+++ b/browser/components/loop/test/functional/test_1_browser_call.py
@@ -122,25 +122,24 @@ class Test1BrowserCall(MarionetteTestCas
 
         # Join the room
         join_button = self.wait_for_element_displayed(By.CLASS_NAME,
                                                       "btn-join")
         join_button.click()
 
     # Assumes the standlone or the conversation window is selected first.
     def check_remote_video(self):
-        # TODO: This is disabled currently due to bug 1122486
-        # video_wrapper = self.wait_for_element_displayed(By.CSS_SELECTOR, ".media .OT_subscriber .OT_video-container", 20)
-        # video = self.wait_for_subelement_displayed(video_wrapper, By.TAG_NAME, "video")
+        video_wrapper = self.wait_for_element_displayed(
+            By.CSS_SELECTOR,
+            ".media .OT_subscriber .OT_video-container", 20)
+        video = self.wait_for_subelement_displayed(
+            video_wrapper, By.TAG_NAME, "video")
 
-        # self.wait_for_element_attribute_to_be_false(video, "paused")
-        # self.assertEqual(video.get_attribute("ended"), "false")
-
-        # Due to the above waits being disabled, we do a sleep.
-        sleep(15)
+        self.wait_for_element_attribute_to_be_false(video, "paused")
+        self.assertEqual(video.get_attribute("ended"), "false")
 
     def standalone_check_remote_video(self):
         self.switch_to_standalone()
         self.check_remote_video()
 
     def local_check_remote_video(self):
         self.switch_to_chatbox()
         self.check_remote_video()