Bug 1230102 - Re-enable the functional tests for Loop. r=mikedeboer NPTOB DONTBUILD

This commit is contained in:
Mark Banner 2016-01-11 16:23:21 +00:00
parent 90e314bfe7
commit da4bac9c12
2 changed files with 26 additions and 26 deletions

View File

@ -14,7 +14,7 @@ FIREFOX_PREFERENCES = {
"devtools.debugger.prompt-connection": False,
"devtools.debugger.remote-enabled": True,
"media.volume_scale": "0",
"loop.gettingStarted.latestFTUVersion": 0,
"loop.gettingStarted.latestFTUVersion": 1,
# this dialog is fragile, and likely to introduce intermittent failures
"media.navigator.permission.disabled": True,

View File

@ -263,41 +263,41 @@ class Test1BrowserCall(MarionetteTestCase):
def test_1_browser_call(self):
self.switch_to_panel()
# self.local_start_a_conversation()
self.local_start_a_conversation()
# # Check the self video in the conversation window
# self.local_check_room_self_video()
# Check the self video in the conversation window
self.local_check_room_self_video()
# # make sure that the media start time is not initialized
# self.local_check_media_start_time_uninitialized()
# make sure that the media start time is not initialized
self.local_check_media_start_time_uninitialized()
# room_url = self.local_get_and_verify_room_url()
room_url = self.local_get_and_verify_room_url()
# # load the link clicker interface into the current content browser
# self.standalone_load_and_join_room(room_url)
# load the link clicker interface into the current content browser
self.standalone_load_and_join_room(room_url)
# # Check we get the video streams
# self.standalone_check_remote_video()
# self.local_check_remote_video()
# Check we get the video streams
self.standalone_check_remote_video()
self.local_check_remote_video()
# # Check text messaging
# self.check_text_messaging()
# Check text messaging
self.check_text_messaging()
# # since bi-directional media is connected, make sure we've set
# # the start time
# self.local_check_media_start_time_initialized()
# since bi-directional media is connected, make sure we've set
# the start time
self.local_check_media_start_time_initialized()
# # Check that screenshare was automatically started
# self.standalone_check_remote_screenshare()
# Check that screenshare was automatically started
self.standalone_check_remote_screenshare()
# # We hangup on the remote (standalone) side, because this also leaves
# # the local chatbox with the local publishing media still connected,
# # which means that the local_check_connection_length below
# # verifies that the connection is noted at the time the remote media
# # drops, rather than waiting until the window closes.
# self.remote_leave_room()
# We hangup on the remote (standalone) side, because this also leaves
# the local chatbox with the local publishing media still connected,
# which means that the local_check_connection_length below
# verifies that the connection is noted at the time the remote media
# drops, rather than waiting until the window closes.
self.remote_leave_room()
# self.local_check_connection_length_noted()
self.local_check_connection_length_noted()
def tearDown(self):
self.loop_test_servers.shutdown()