Bug 1258020 - Increase timeouts for network bandwidth limiting tests. Netflix takes a LONG time to load when bandwidth is low. r=maja_zf,SingingTree
authorSyd Polk <spolk@mozilla.com>
Thu, 24 Mar 2016 11:49:05 -0500
changeset 291123 b2d35c87d6cddeea7f88e5bc4a7bccebd3100fce
parent 291122 3ea44d60cb3fe23293fe3326c43636336e4ac8dc
child 291124 2e97b6bf18de0d88acfe70eb96a04b097e8d436c
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmaja_zf, SingingTree
bugs1258020
milestone48.0a1
Bug 1258020 - Increase timeouts for network bandwidth limiting tests. Netflix takes a LONG time to load when bandwidth is low. r=maja_zf,SingingTree MozReview-Commit-ID: 3mukTlWesby
dom/media/test/external/external_media_harness/testcase.py
dom/media/test/external/external_media_tests/playback/test_ultra_low_bandwidth.py
--- a/dom/media/test/external/external_media_harness/testcase.py
+++ b/dom/media/test/external/external_media_harness/testcase.py
@@ -117,26 +117,25 @@ class NetworkBandwidthTestCase(MediaTest
         BrowserMobProxyTestCaseMixin.setUp(self)
         self.proxy = self.create_browsermob_proxy()
 
     def tearDown(self):
         super(NetworkBandwidthTestCase, self).tearDown()
         BrowserMobProxyTestCaseMixin.tearDown(self)
         self.proxy = None
 
-    def run_videos(self):
+    def run_videos(self, timeout=60):
         """
         Run each of the videos in the video list. Raises if something goes
         wrong in playback.
         """
         with self.marionette.using_context('content'):
             for url in self.video_urls:
-                video = VP(self.marionette, url,
-                                       stall_wait_time=60,
-                                       set_duration=60)
+                video = VP(self.marionette, url, stall_wait_time=60,
+                           set_duration=60, timeout=timeout)
                 self.run_playback(video)
 
 
 class VideoPlaybackTestsMixin(object):
 
     """
     Test MSE playback in HTML5 video element.
 
@@ -183,25 +182,25 @@ class VideoPlaybackTestsMixin(object):
 class NetworkBandwidthTestsMixin(object):
 
     """
         Test video urls with various bandwidth settings.
     """
 
     def test_playback_limiting_bandwidth_250(self):
         self.proxy.limits({'downstream_kbps': 250})
-        self.run_videos()
+        self.run_videos(timeout=120)
 
     def test_playback_limiting_bandwidth_500(self):
         self.proxy.limits({'downstream_kbps': 500})
-        self.run_videos()
+        self.run_videos(timeout=120)
 
     def test_playback_limiting_bandwidth_1000(self):
         self.proxy.limits({'downstream_kbps': 1000})
-        self.run_videos()
+        self.run_videos(timeout=120)
 
 
 reset_adobe_gmp_script = """
 navigator.requestMediaKeySystemAccess('com.adobe.primetime',
 [{initDataType: 'cenc'}]).then(
     function(access) {
         marionetteScriptFinished('success');
     },
--- a/dom/media/test/external/external_media_tests/playback/test_ultra_low_bandwidth.py
+++ b/dom/media/test/external/external_media_tests/playback/test_ultra_low_bandwidth.py
@@ -7,9 +7,9 @@ from marionette import BrowserMobProxyTe
 from external_media_harness.testcase import NetworkBandwidthTestCase
 
 
 class TestUltraLowBandwidth(NetworkBandwidthTestCase,
                                     BrowserMobProxyTestCaseMixin):
 
     def test_playback_limiting_bandwidth_160(self):
         self.proxy.limits({'downstream_kbps': 160})
-        self.run_videos()
+        self.run_videos(timeout=120)