Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1238648 - Use external-media-tests in tree instead of github for tests. r=maja_zf, r=whimboo

Browse Source 
--HG--
extra : commitid : 9alr2iRFKaf
extra : rebase_source : 6a46414396a317bb1d5e493be1fa30e2f62e409d
This commit is contained in:
Syd Polk 2016-01-29 16:12:30 -06:00
parent dd6be4d4ca
commit be898d0326
8 changed files with 33 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/media/test/external/MANIFEST.in vendored
View File

@ -1,4 +1,5 @@
exclude MANIFEST.in
include external-media-tests-requirements.txt
recursive-include external_media_harness *
recursive-include external_media_tests *

3
testing/config/external-media-tests-requirements.txt Normal file
View File

@ -0,0 +1,3 @@
-r marionette_requirements.txt
../external-media-tests/
../puppeteer/firefox/

6
testing/mozharness/configs/mediatests/buildbot_posix_config.py
View File

@ -12,7 +12,6 @@ config = {
'python': '/tools/buildbot/bin/python',
'virtualenv': ['/tools/buildbot/bin/python', '/tools/misc-python/virtualenv.py'],
'tooltool.py': "/tools/tooltool.py",
'gittool.py': os.path.join(external_tools_path, 'gittool.py'),
},
"find_links": [
@ -26,7 +25,6 @@ config = {
"default_actions": [
'clobber',
'read-buildbot-config',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',
@ -39,10 +37,6 @@ config = {
"download_minidump_stackwalk": True,
"download_symbols": "ondemand",
"firefox_media_repo": 'https://github.com/mjzffr/firefox-media-tests.git',
"firefox_media_branch": 'master',
"firefox_media_rev": '0830e972e4b95fef3507207fc6bce028da27f2d3',
"suite_definitions": {
"media-tests": {
"options": [],

7
testing/mozharness/configs/mediatests/buildbot_windows_config.py
View File

@ -17,8 +17,6 @@ config = {
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
'gittool.py': [sys.executable,
os.path.join(external_tools_path, 'gittool.py')],
'hgtool.py': [sys.executable,
os.path.join(external_tools_path, 'hgtool.py')],
@ -36,7 +34,6 @@ config = {
"default_actions": [
'clobber',
'read-buildbot-config',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',
@ -50,10 +47,6 @@ config = {
"download_minidump_stackwalk": True,
"download_symbols": "ondemand",
"firefox_media_repo": 'https://github.com/mjzffr/firefox-media-tests.git',
"firefox_media_branch": 'master',
"firefox_media_rev": '0830e972e4b95fef3507207fc6bce028da27f2d3',
"suite_definitions": {
"media-tests": {
"options": [],

20
testing/mozharness/configs/mediatests/jenkins_config.py
View File

@ -26,10 +26,6 @@ config = {
'download_symbols': 'ondemand',
'download_tooltool': True,
# Version control information
'firefox_media_repo': 'https://github.com/mjzffr/firefox-media-tests.git',
'firefox_media_branch': 'master',
# Default test suite
'test_suite': 'media-tests',
@ -46,7 +42,6 @@ config = {
'default_actions': [
'clobber',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',
@ -55,18 +50,3 @@ config = {
}
# General local variable overwrite
# Bug 1227079 - Python executable eeded to get it executed on Windows
if platform.system() == 'windows':
gittool = [
sys.executable,
os.path.join(external_tools_path, 'gittool.py')
]
else:
gittool = os.path.join(external_tools_path, 'gittool.py')
exes = {
'gittool.py' : gittool,
}
config['exes'] = exes

85
testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
View File

@ -57,20 +57,6 @@ media_test_config_options = [
"default": False,
"help": "Enable e10s when running marionette tests."
}],
[['--firefox-media-repo'], {
'dest': 'firefox_media_repo',
'default': 'https://github.com/mjzffr/firefox-media-tests.git',
'help': 'which firefox_media_tests repo to use',
}],
[['--firefox-media-branch'], {
'dest': 'firefox_media_branch',
'default': 'master',
'help': 'which branch to use for firefox_media_tests',
}],
[['--firefox-media-rev'], {
'dest': 'firefox_media_rev',
'help': 'which firefox_media_tests revision to use',
}],
[["--suite"],
{"action": "store",
"dest": "test_suite",
@ -127,7 +113,6 @@ class FirefoxMediaTestsBase(TestingMixin, VCSToolsScript):
self.config_options = media_test_config_options + (config_options or [])
actions = [
'clobber',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',
@ -155,72 +140,60 @@ class FirefoxMediaTestsBase(TestingMixin, VCSToolsScript):
@PreScriptAction('create-virtualenv')
def _pre_create_virtualenv(self, action):
dirs = self.query_abs_dirs()
marionette_requirements = os.path.join(dirs['abs_test_install_dir'],
'config',
'marionette_requirements.txt')
if os.access(marionette_requirements, os.F_OK):
self.register_virtualenv_module(requirements=[marionette_requirements],
two_pass=True)
media_tests_requirements = os.path.join(dirs['firefox_media_dir'],
'requirements.txt')
media_tests_requirements = os.path.join(dirs['abs_test_install_dir'],
'config',
'external-media-tests-requirements.txt')
if os.access(media_tests_requirements, os.F_OK):
self.register_virtualenv_module(requirements=[media_tests_requirements],
two_pass=True)
def download_and_extract(self):
"""Overriding method from TestingMixin until firefox-media-tests are in tree.
"""Overriding method from TestingMixin for more specific behavior.
Right now we only care about the installer and symbolds.
We use the test_packages_url command line argument to check where to get the
harness, puppeteer, and tests from and how to set them up.
"""
self._download_installer()
if self.config.get('download_symbols'):
self._download_and_extract_symbols()
target_unzip_dirs = ['config/*',
'external-media-tests/*',
'marionette/*',
'mozbase/*',
'puppeteer/*',
'tools/wptserve/*',
]
super(FirefoxMediaTestsBase, self).download_and_extract(
target_unzip_dirs=target_unzip_dirs)
def query_abs_dirs(self):
if self.abs_dirs:
return self.abs_dirs
abs_dirs = super(FirefoxMediaTestsBase, self).query_abs_dirs()
dirs = {
'firefox_media_dir': os.path.join(abs_dirs['abs_work_dir'],
'firefox-media-tests')
}
dirs['abs_test_install_dir'] = os.path.join(abs_dirs['abs_work_dir'],
'abs_test_install_dir' : os.path.join(abs_dirs['abs_work_dir'],
'tests')
}
dirs['external-media-tests'] = os.path.join(dirs['abs_test_install_dir'],
'external-media-tests')
abs_dirs.update(dirs)
self.abs_dirs = abs_dirs
return self.abs_dirs
@PreScriptAction('checkout')
def _pre_checkout(self, action):
super(FirefoxMediaTestsBase, self)._pre_checkout(action)
c = self.config
dirs = self.query_abs_dirs()
self.firefox_media_vc = {
'branch': c['firefox_media_branch'],
'repo': c['firefox_media_repo'],
'dest': dirs['firefox_media_dir'],
}
if 'firefox-media-rev' in c:
self.firefox_media_vc['revision'] = c['firefox_media_rev']
def checkout(self):
self.vcs_checkout(vcs='gittool', **self.firefox_media_vc)
def _query_cmd(self):
""" Determine how to call firefox-media-tests """
if not self.binary_path:
self.fatal("Binary path could not be determined. "
"Should be set by default during 'install' action.")
dirs = self.query_abs_dirs()
venv_python_path = self.query_python_path()
runner_script = os.path.join(dirs['firefox_media_dir'],
'media_test_harness',
'runtests.py')
cmd = [venv_python_path, runner_script]
import external_media_harness.runtests
cmd = [
self.query_python_path(),
external_media_harness.runtests.__file__
]
cmd += ['--binary', self.binary_path]
if self.symbols_path:
cmd += ['--symbols-path', self.symbols_path]
@ -238,8 +211,8 @@ class FirefoxMediaTestsBase(TestingMixin, VCSToolsScript):
self.fatal("%s is not defined in the config!" % test_suite)
test_manifest = None if test_suite != 'media-youtube-tests' else \
os.path.join(dirs['firefox_media_dir'],
'firefox_media_tests',
os.path.join(dirs['external-media-tests'],
'external_media_tests',
'playback', 'youtube', 'manifest.ini')
config_fmt_args = {
'test_manifest': test_manifest,

1
testing/mozharness/scripts/firefox_media_tests_buildbot.py
View File

@ -37,7 +37,6 @@ class FirefoxMediaTestsBuildbot(FirefoxMediaTestsBase, BlobUploadMixin):
config_options=config_options,
all_actions=['clobber',
'read-buildbot-config',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',

1
testing/mozharness/scripts/firefox_media_tests_jenkins.py
View File

@ -26,7 +26,6 @@ class FirefoxMediaTestsJenkins(FirefoxMediaTestsBase):
def __init__(self):
super(FirefoxMediaTestsJenkins, self).__init__(
all_actions=['clobber',
'checkout',
'download-and-extract',
'create-virtualenv',
'install',