--- a/testing/mozharness/mozharness/base/vcs/tcvcs.py
+++ b/testing/mozharness/mozharness/base/vcs/tcvcs.py
@@ -1,12 +1,11 @@
import os.path
from mozharness.base.script import ScriptMixin
-from mozharness.base.log import LogMixin, OutputParser
-from mozharness.base.errors import VCSException
+from mozharness.base.log import LogMixin
class TcVCS(ScriptMixin, LogMixin):
def __init__(self, log_obj=None, config=None, vcs_config=None,
script_obj=None):
super(TcVCS, self).__init__()
self.log_obj = log_obj
self.script_obj = script_obj
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -2046,17 +2046,16 @@ or run without that action (ie: --no-{ac
branch=unittest_branch,
sendchange_props=sendchange_props)
else:
self.fatal('type: "%s" is unknown for sendchange type. valid '
'strings are "unittest" or "talos"' % test_type)
def update(self):
""" submit balrog update steps. """
- c = self.config
if not self.query_is_nightly():
self.info("Not a nightly build, skipping balrog submission.")
return
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)
if not self.config.get("balrog_servers"):
--- a/testing/mozharness/mozharness/mozilla/gaia.py
+++ b/testing/mozharness/mozharness/mozilla/gaia.py
@@ -1,17 +1,18 @@
"""
Module for performing gaia-specific tasks
"""
import json
import os
import re
-from mozharness.base.errors import HgErrorList, BaseErrorList, ZipErrorList
+from mozharness.base.errors import HgErrorList, BaseErrorList, TarErrorList, \
+ ZipErrorList
from mozharness.base.log import ERROR, FATAL
gaia_config_options = [
[["--gaia-dir"],
{"action": "store",
"dest": "gaia_dir",
"help": "directory where gaia repo should be cloned"
}],
--- a/testing/mozharness/mozharness/mozilla/selfserve.py
+++ b/testing/mozharness/mozharness/mozilla/selfserve.py
@@ -1,10 +1,9 @@
import json
-import os
import site
# SelfServeMixin {{{1
class SelfServeMixin(object):
def _get_session(self):
site_packages_path = self.query_python_site_packages_path()
site.addsitedir(site_packages_path)
import requests
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
@@ -1,17 +1,16 @@
#!/usr/bin/env python
# ***** BEGIN LICENSE BLOCK *****
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
# ***** BEGIN LICENSE BLOCK *****
import copy
-import glob
import os
import re
import urlparse
from mozharness.base.log import ERROR, WARNING
from mozharness.base.script import PreScriptAction
from mozharness.mozilla.testing.testbase import (TestingMixin,
testing_config_options)
--- a/testing/mozharness/mozharness/mozilla/testing/gaia_test.py
+++ b/testing/mozharness/mozharness/mozilla/testing/gaia_test.py
@@ -1,24 +1,22 @@
# ***** BEGIN LICENSE BLOCK *****
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
# ***** END LICENSE BLOCK *****
import copy
import os
-import re
import sys
import time
# load modules from parent dir
sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
-from mozharness.base.errors import TarErrorList, ZipErrorList
from mozharness.base.log import INFO, ERROR, WARNING, FATAL
from mozharness.base.script import PreScriptAction
from mozharness.base.transfer import TransferMixin
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.buildbot import TBPL_SUCCESS, TBPL_WARNING, TBPL_FAILURE
from mozharness.mozilla.gaia import GaiaMixin, gaia_config_options
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -11,20 +11,20 @@ run talos tests in a virtualenv
import os
import pprint
import copy
import re
import json
from mozharness.base.config import parse_config_file
from mozharness.base.errors import PythonErrorList
-from mozharness.base.log import OutputParser, DEBUG, ERROR, CRITICAL, FATAL
+from mozharness.base.log import OutputParser, DEBUG, ERROR, CRITICAL
from mozharness.base.log import INFO, WARNING
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
-from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options, INSTALLER_SUFFIXES
+from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.testing.errors import TinderBoxPrintRe
from mozharness.mozilla.buildbot import TBPL_SUCCESS, TBPL_WORST_LEVEL_TUPLE
from mozharness.mozilla.buildbot import TBPL_RETRY, TBPL_FAILURE, TBPL_WARNING
TalosErrorList = PythonErrorList + [
{'regex': re.compile(r'''run-as: Package '.*' is unknown'''), 'level': DEBUG},
{'substr': r'''FAIL: Graph server unreachable''', 'level': CRITICAL},
@@ -187,17 +187,16 @@ class Talos(TestingMixin, MercurialScrip
sps_results.append('--spsProfile')
if self.sps_profile_interval:
sps_results.extend(
['--spsProfileInterval', str(self.sps_profile_interval)]
)
return sps_results
def query_abs_dirs(self):
- c = self.config
if self.abs_dirs:
return self.abs_dirs
abs_dirs = super(Talos, self).query_abs_dirs()
abs_dirs['abs_blob_upload_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'blobber_upload_dir')
self.abs_dirs = abs_dirs
return self.abs_dirs
def query_talos_json_config(self):
--- a/testing/mozharness/mozharness/mozilla/tooltool.py
+++ b/testing/mozharness/mozharness/mozilla/tooltool.py
@@ -1,18 +1,16 @@
"""module for tooltool operations"""
import os
import sys
from mozharness.base.errors import PythonErrorList
from mozharness.base.log import ERROR, FATAL
from mozharness.mozilla.proxxy import Proxxy
-from mozharness.lib.python.authentication import get_credentials_path
-
TooltoolErrorList = PythonErrorList + [{
'substr': 'ERROR - ', 'level': ERROR
}]
TOOLTOOL_PY_URL = \
"https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py"
--- a/testing/mozharness/mozharness/mozilla/vcstools.py
+++ b/testing/mozharness/mozharness/mozilla/vcstools.py
@@ -4,32 +4,29 @@
# 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/.
# ***** END LICENSE BLOCK *****
"""vcstools.py
Author: Armen Zambrano G.
"""
import os
-import stat
from mozharness.base.script import PreScriptAction
from mozharness.base.vcs.vcsbase import VCSScript
VCS_TOOLS = ('hgtool.py', 'gittool.py')
class VCSToolsScript(VCSScript):
''' This script allows us to fetch hgtool.py and gittool.py if
we're running the script on developer mode.
'''
@PreScriptAction('checkout')
def _pre_checkout(self, action):
- dirs = self.query_abs_dirs()
-
if self.config.get('developer_mode'):
# We put them on base_work_dir to prevent the clobber action
# to delete them before we use them
for vcs_tool in VCS_TOOLS:
file_path = self.query_exe(vcs_tool)
if not os.path.exists(file_path):
self.download_file(
url=self.config[vcs_tool],
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -17,17 +17,17 @@ import time
import tempfile
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozprocess import ProcessHandler
from mozharness.base.log import FATAL
-from mozharness.base.script import BaseScript, PostScriptRun
+from mozharness.base.script import BaseScript
from mozharness.base.vcs.vcsbase import VCSMixin
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.mozbase import MozbaseMixin
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
from mozharness.mozilla.testing.unittest import EmulatorMixin
class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin, BaseScript, MozbaseMixin):
@@ -693,20 +693,17 @@ class AndroidEmulatorTest(BlobUploadMixi
}
suite_category = self.test_suite_definitions[self.test_suite]["category"]
suite_category = aliases.get(suite_category, suite_category)
parser = self.get_test_output_parser(
suite_category,
config=self.config,
log_obj=self.log_obj,
error_list=self.error_list)
- return_code = self.run_command(cmd,
- cwd=cwd,
- env=env,
- output_parser=parser)
+ self.run_command(cmd, cwd=cwd, env=env, output_parser=parser)
tbpl_status, log_level = parser.evaluate_parser(0)
parser.append_tinderboxprint_line(self.test_suite)
self.info("##### %s log ends" % self.test_suite)
self._dump_emulator_log()
self.buildbot_status(tbpl_status, level=log_level)
def stop_emulator(self):
--- a/testing/mozharness/scripts/android_panda_talos.py
+++ b/testing/mozharness/scripts/android_panda_talos.py
@@ -192,17 +192,16 @@ class PandaTalosTest(TestingMixin, Mercu
if preflight_run_method:
preflight_run_method(suite_category, suites)
if suites:
self.info('#### Running %s suites' % suite_category)
for suite in suites:
dirs = self.query_abs_dirs()
abs_base_cmd = self._query_abs_base_cmd(suite_category)
cmd = abs_base_cmd[:]
- tbpl_status, log_level = None, None
c = self.config
if c.get('minidump_stackwalk_path'):
env['MINIDUMP_STACKWALK'] = c['minidump_stackwalk_path']
env['MOZ_UPLOAD_DIR'] = self.query_abs_dirs()['abs_blob_upload_dir']
env['MINIDUMP_SAVE_PATH'] = self.query_abs_dirs()['abs_blob_upload_dir']
if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
self.mkdir_p(env['MOZ_UPLOAD_DIR'])
env = self.query_env(partial_env=env, log_level=INFO)
--- a/testing/mozharness/scripts/androidx86_emulator_unittest.py
+++ b/testing/mozharness/scripts/androidx86_emulator_unittest.py
@@ -24,18 +24,16 @@ from mozharness.base.log import FATAL
from mozharness.base.script import BaseScript, PostScriptRun
from mozharness.base.vcs.vcsbase import VCSMixin
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.mozbase import MozbaseMixin
from mozharness.mozilla.buildbot import TBPL_WORST_LEVEL_TUPLE
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
from mozharness.mozilla.testing.unittest import EmulatorMixin
-from mozharness.mozilla.testing.device import ADBDeviceHandler
-
class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin, BaseScript, MozbaseMixin):
config_options = [[
["--robocop-url"],
{"action": "store",
"dest": "robocop_url",
"default": None,
"help": "URL to the robocop apk",
@@ -472,17 +470,16 @@ class AndroidEmulatorTest(BlobUploadMixi
Run a test suite on an emulator
We return a dictionary with the following information:
- subprocess object that is running the test on the emulator
- the filename where the stdout is going to
- the stdout where the output is going to
- the suite name that is associated
"""
- dirs = self.query_abs_dirs()
cmd = self._build_command(self.emulators[emulator_index], suite_name)
try:
cwd = self._query_tests_dir(suite_name)
except:
self.fatal("Don't know how to run --test-suite '%s'!" % suite_name)
env = self.query_env()
--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -21,17 +21,17 @@ try:
except ImportError:
import json
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
# import the guts
from mozharness.base.config import parse_config_file
-from mozharness.base.log import WARNING, ERROR, FATAL
+from mozharness.base.log import WARNING, FATAL
from mozharness.mozilla.l10n.locales import GaiaLocalesMixin, LocalesMixin
from mozharness.mozilla.purge import PurgeMixin
from mozharness.mozilla.signing import SigningMixin
from mozharness.mozilla.repo_manifest import add_project
from mozharness.mozilla.mapper import MapperMixin
from mozharness.mozilla.updates.balrog import BalrogMixin
from mozharness.base.python import VirtualenvMixin
from mozharness.base.python import InfluxRecordingMixin
--- a/testing/mozharness/scripts/b2g_desktop_unittest.py
+++ b/testing/mozharness/scripts/b2g_desktop_unittest.py
@@ -7,17 +7,17 @@ import copy
import os
import re
import sys
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import BaseErrorList
-from mozharness.base.log import ERROR, WARNING
+from mozharness.base.log import ERROR
from mozharness.base.script import PreScriptAction
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
class B2GDesktopTest(BlobUploadMixin, TestingMixin, MercurialScript):
test_suites = ('mochitest',
--- a/testing/mozharness/scripts/b2g_emulator_unittest.py
+++ b/testing/mozharness/scripts/b2g_emulator_unittest.py
@@ -9,17 +9,17 @@ import copy
import os
import re
import sys
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import BaseErrorList, TarErrorList
-from mozharness.base.log import ERROR, WARNING
+from mozharness.base.log import ERROR
from mozharness.base.script import (
BaseScript,
PreScriptAction,
)
from mozharness.base.vcs.vcsbase import VCSMixin
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.testing.errors import LogcatErrorList
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -14,17 +14,17 @@ import sys
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.script import BaseScript
from mozharness.mozilla.buildbot import BuildbotMixin
from mozharness.mozilla.purge import PurgeMixin
from mozharness.mozilla.release import ReleaseMixin
from mozharness.base.python import VirtualenvMixin
-from mozharness.base.log import ERROR, FATAL
+from mozharness.base.log import FATAL
try:
import simplejson as json
assert json
except ImportError:
import json
# DesktopPartnerRepacks {{{1
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -16,17 +16,17 @@ import sys
import copy
import shutil
import glob
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import BaseErrorList
-from mozharness.base.log import INFO, ERROR, WARNING
+from mozharness.base.log import INFO, ERROR
from mozharness.base.script import PreScriptAction
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.mozbase import MozbaseMixin
from mozharness.mozilla.testing.codecoverage import (
CodeCoverageMixin,
code_coverage_config_options
)
@@ -561,17 +561,16 @@ class DesktopUnittest(TestingMixin, Merc
files.append(os.path.join(abs_gtest_dir, 'dependentlibs.list.gtest'))
for f in files:
self.move(f, abs_res_dir)
self.copytree(os.path.join(abs_gtest_dir, 'gtest_bin'),
os.path.join(abs_app_dir))
def preflight_mozmill(self, suites):
- c = self.config
dirs = self.query_abs_dirs()
abs_app_dir = self.query_abs_app_dir()
abs_app_plugins_dir = os.path.join(abs_app_dir, 'plugins')
abs_app_extensions_dir = os.path.join(abs_app_dir, 'extensions')
self.mkdir_p(abs_app_plugins_dir)
self.copytree(dirs['abs_test_bin_plugins_dir'],
abs_app_plugins_dir,
@@ -583,17 +582,16 @@ class DesktopUnittest(TestingMixin, Merc
modules = ['jsbridge', 'mozmill']
for module in modules:
self.install_module(module=os.path.join(dirs['abs_mozmill_dir'],
'resources',
module))
def _run_category_suites(self, suite_category, preflight_run_method=None):
"""run suite(s) to a specific category"""
- c = self.config
dirs = self.query_abs_dirs()
suites = self._query_specified_suites(suite_category)
abs_app_dir = self.query_abs_app_dir()
abs_res_dir = self.query_abs_res_dir()
if suites:
if preflight_run_method:
preflight_run_method(suites)
--- a/testing/mozharness/scripts/firefox_media_tests_jenkins.py
+++ b/testing/mozharness/scripts/firefox_media_tests_jenkins.py
@@ -3,24 +3,21 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
# ***** BEGIN LICENSE BLOCK *****
"""firefox_media_tests_jenkins.py
Author: Syd Polk
"""
-import copy
-import glob
import os
import sys
sys.path.insert(1, os.path.dirname(sys.path[0]))
-from mozharness.base.script import PreScriptAction
from mozharness.mozilla.testing.firefox_media_tests import (
FirefoxMediaTestsBase
)
class FirefoxMediaTestsJenkins(FirefoxMediaTestsBase):
def __init__(self):
--- a/testing/mozharness/scripts/luciddream_unittest.py
+++ b/testing/mozharness/scripts/luciddream_unittest.py
@@ -7,18 +7,18 @@
import copy
import os
import sys
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
-from mozharness.base.errors import BaseErrorList, TarErrorList, ZipErrorList
-from mozharness.base.log import ERROR, WARNING, FATAL, INFO
+from mozharness.base.errors import BaseErrorList, TarErrorList
+from mozharness.base.log import ERROR, FATAL, INFO
from mozharness.base.script import (
BaseScript,
PreScriptAction,
)
from mozharness.base.transfer import TransferMixin
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -8,18 +8,18 @@
import copy
import os
import re
import sys
# load modules from parent dir
sys.path.insert(1, os.path.dirname(sys.path[0]))
-from mozharness.base.errors import TarErrorList, ZipErrorList
-from mozharness.base.log import INFO, ERROR, WARNING, FATAL
+from mozharness.base.errors import TarErrorList
+from mozharness.base.log import INFO, ERROR, WARNING
from mozharness.base.script import PreScriptAction
from mozharness.base.transfer import TransferMixin
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.buildbot import TBPL_SUCCESS, TBPL_WARNING, TBPL_FAILURE
from mozharness.mozilla.gaia import GaiaMixin
from mozharness.mozilla.testing.errors import LogcatErrorList
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -485,18 +485,18 @@ class MobileSingleLocale(MockMixin, Loca
cwd = dirs['abs_locales_dir']
branch = self.config['branch']
revision = self.query_revision()
repo = self.query_l10n_repo()
pushinfo = self.vcs_query_pushinfo(repo, revision, vcs='hgtool')
pushdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(pushinfo.pushdate))
routes_json = os.path.join(self.query_abs_dirs()['abs_mozilla_dir'],
'testing/taskcluster/routes.json')
- with open(routes_json) as f:
- contents = json.load(f)
+ with open(routes_json) as routes_file:
+ contents = json.load(routes_file)
templates = contents['l10n']
for locale in locales:
output = self.get_output_from_command_m(
"%s echo-variable-UPLOAD_FILES AB_CD=%s" % (make, locale),
cwd=cwd,
env=upload_env,
)
--- a/testing/mozharness/scripts/update_apk_description.py
+++ b/testing/mozharness/scripts/update_apk_description.py
@@ -180,17 +180,17 @@ class UpdateDescriptionAPK(BaseScript, G
# Google play expects some locales codes (de-DE instead of de)
locale = self.locale_mapping(locale)
try:
self.log("Updating " + package_name + " for '" + locale +
"' / title: '" + title + "', short_desc: '" +
short_desc[0:20] + "'..., long_desc: '" +
long_desc[0:20] + "...'")
- listing_response = service.edits().listings().update(
+ service.edits().listings().update(
editId=edit_id, packageName=package_name, language=locale,
body={'fullDescription': long_desc,
'shortDescription': short_desc,
'title': title}).execute()
nb_locales += 1
except client.AccessTokenRefreshError:
self.log('The credentials have been revoked or expired,'
'please re-run the application to re-authorize')