Bug 1240991 - Remove __init__ from FirefoxMediaHarness and update requirements. r=maja_zf

--HG--
extra : rebase_source : 40f1fcc4759989f272b2bb585dc11e705a33b661
This commit is contained in:
Syd Polk 2016-01-21 17:58:05 -06:00
Родитель 57860ab95d
Коммит 7c98f3d150
3 изменённых файлов: 13 добавлений и 22 удалений

Просмотреть файл

@ -86,17 +86,6 @@ class MediaTestRunner(BaseMarionetteTestRunner):
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})

18
dom/media/test/external/requirements.txt поставляемый
Просмотреть файл

@ -1,21 +1,23 @@
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

6
dom/media/test/external/setup.py поставляемый
Просмотреть файл

@ -7,9 +7,9 @@ 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',
]