Bug 1240991 - Remove __init__ from FirefoxMediaHarness and update requirements. r?maja_zf
--- a/dom/media/test/external/external_media_harness/runtests.py
+++ b/dom/media/test/external/external_media_harness/runtests.py
@@ -81,27 +81,16 @@ class MediaTestRunner(BaseMarionetteTest
logger.warning('Failed to gather test failure media debug',
exc_info=True)
return rv
self.result_callbacks.append(gather_media_debug)
class FirefoxMediaHarness(MarionetteHarness):
- def __init__(self,
- runner_class=MediaTestRunner,
- parser_class=MediaTestArguments):
- # workaround until next marionette-client release - Bug 1227918
- try:
- MarionetteHarness.__init__(self, runner_class, parser_class)
- except Exception:
- logger = mozlog.commandline.setup_logging('Media-test harness', {})
- logger.error('Failure setting up harness', exc_info=True)
- raise
-
def parse_args(self, *args, **kwargs):
return MarionetteHarness.parse_args(self, {'mach': sys.stdout})
def cli():
mn_cli(MediaTestRunner, MediaTestArguments, FirefoxMediaHarness)
if __name__ == '__main__':
--- a/dom/media/test/external/requirements.txt
+++ b/dom/media/test/external/requirements.txt
@@ -1,22 +1,24 @@
-browsermob-proxy==0.6.0
+browsermob-proxy==0.7.1
manifestparser==1.1
mozcrash==0.16
-mozdevice==0.46
+mozdevice==0.48
mozfile==1.2
mozhttpd==0.7
-mozinfo==0.8
+mozinfo==0.9
# optional - mozharness install step
mozInstall==1.12
-mozlog==3.0
+mozlog==3.1
moznetwork==0.27
mozprocess==0.22
-mozprofile==0.27
-mozrunner==6.9
+mozprofile==0.28
+mozrunner==6.11
moztest==0.7
mozversion==1.4
-marionette-client == 2.0.0
-marionette-driver == 1.1.1
+wptserve==1.3.0
+marionette-client == 2.1.0
+marionette-driver == 1.2.0
+marionette-transport == 1.1.0
firefox-puppeteer==3.1.0
# Install the firefox media tests package
./
--- a/dom/media/test/external/setup.py
+++ b/dom/media/test/external/setup.py
@@ -2,19 +2,19 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from setuptools import setup, find_packages
PACKAGE_VERSION = '1.0'
deps = [
- 'marionette-client == 2.0.0',
- 'marionette-driver == 1.1.1',
- 'mozlog == 3.0',
+ 'marionette-client == 2.1.0',
+ 'marionette-driver == 1.2.0',
+ 'mozlog == 3.1',
'manifestparser == 1.1',
'firefox-puppeteer >= 3.1.0, <4.0.0',
]
setup(name='external-media-tests',
version=PACKAGE_VERSION,
description=('A collection of Mozilla Firefox media playback tests run '
'with Marionette'),