diff options
Diffstat (limited to 'testing/mozharness')
7 files changed, 1 insertions, 30 deletions
diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 8a2e172cbd..9fd507816d 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -100,7 +100,6 @@ class MakeUploadOutputParser(OutputParser): ('symbolsUrl', "m.endswith('crashreporter-symbols.zip') or " "m.endswith('crashreporter-symbols-full.zip')"), ('testsUrl', "m.endswith(('tests.tar.bz2', 'tests.zip'))"), - ('robocopApkUrl', "m.endswith('apk') and 'robocop' in m"), ('jsshellUrl', "'jsshell-' in m and m.endswith('.zip')"), ('partialMarUrl', "m.endswith('.mar') and '.partial.' in m"), ('completeMarUrl', "m.endswith('.mar')"), @@ -1497,7 +1496,6 @@ or run without that action (ie: --no-{action})" ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or m.endswith('crashreporter-symbols-full.zip')), ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))), - ('robocopApkUrl', lambda m: m.endswith('apk') and 'robocop' in m), ('jsshellUrl', lambda m: 'jsshell-' in m and m.endswith('.zip')), # Temporarily use "TC" in MarUrl parameters. We don't want to # override these to point to taskcluster just yet, and still diff --git a/testing/mozharness/mozharness/mozilla/testing/errors.py b/testing/mozharness/mozharness/mozilla/testing/errors.py index 3937b28c43..3061b5f16d 100644 --- a/testing/mozharness/mozharness/mozilla/testing/errors.py +++ b/testing/mozharness/mozharness/mozilla/testing/errors.py @@ -62,7 +62,6 @@ TinderBoxPrintRe = { 'fail_group': "Unexpected", 'known_fail_group': "Known problems", }, - "robocop_summary": _mochitest_summary, "instrumentation_summary": _mochitest_summary, "cppunittest_summary": { 'regex': re.compile(r'''cppunittests INFO \| (Passed|Failed): (\d+)'''), diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py index 9f13ae1003..2ab2b7e43a 100755 --- a/testing/mozharness/mozharness/mozilla/testing/testbase.py +++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py @@ -427,7 +427,6 @@ You can set this by: # This is a difference in the convention of the configs more than # to how these tests are run, so we pave over these differences here. aliases = { - 'robocop': 'mochitest', 'mochitest-chrome': 'mochitest', 'mochitest-media': 'mochitest', 'mochitest-plain-clipboard': 'mochitest', diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py index 2d17b9cb65..84c5447ed3 100644 --- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -113,7 +113,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin self.test_url = c.get('test_url') self.test_packages_url = c.get('test_packages_url') self.test_manifest = c.get('test_manifest') - self.robocop_path = os.path.join(abs_dirs['abs_work_dir'], "robocop.apk") self.minidump_stackwalk_path = c.get("minidump_stackwalk_path") self.emulator = c.get('emulator') self.test_suite = c.get('test_suite') @@ -359,17 +358,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin install_ok = True return install_ok - def _install_robocop_apk(self): - install_ok = False - if int(self.sdk_level) >= 23: - cmd = [self.adb_path, '-s', self.emulator['device_id'], 'install', '-r', '-g', self.robocop_path] - else: - cmd = [self.adb_path, '-s', self.emulator['device_id'], 'install', '-r', self.robocop_path] - out = self._run_with_timeout(300, cmd) - if 'Success' in out: - install_ok = True - return install_ok - def _dump_host_state(self): self._run_proc(['ps', '-ef']) self._run_proc(['netstat', '-a', '-p', '-n', '-t', '-u']) @@ -642,14 +630,10 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin def download_and_extract(self): """ - Download and extract fennec APK, tests.zip, host utils, and robocop (if required). + Download and extract fennec APK, tests.zip, host utils (if required). """ super(AndroidEmulatorTest, self).download_and_extract(suite_categories=[self.test_suite]) dirs = self.query_abs_dirs() - if self.test_suite.startswith('robocop'): - robocop_url = self.installer_url[:self.installer_url.rfind('/')] + '/robocop.apk' - self.info("Downloading robocop...") - self.download_file(robocop_url, 'robocop.apk', dirs['abs_work_dir'], error_level=FATAL) self.rmtree(dirs['abs_xre_dir']) self.mkdir_p(dirs['abs_xre_dir']) if self.config["hostutils_manifest_path"]: @@ -682,12 +666,6 @@ class AndroidEmulatorTest(BlobUploadMixin, TestingMixin, EmulatorMixin, VCSMixin if not install_ok: self.fatal('INFRA-ERROR: Failed to install %s on %s' % (self.installer_path, self.emulator["name"])) - # Install Robocop if required - if self.test_suite.startswith('robocop'): - install_ok = self._retry(3, 30, self._install_robocop_apk, "Install Robocop APK") - if not install_ok: - self.fatal('INFRA-ERROR: Failed to install %s on %s' % (self.robocop_path, self.emulator["name"])) - self.info("Finished installing apps for %s" % self.emulator["name"]) def run_tests(self): diff --git a/testing/mozharness/scripts/release/antivirus.py b/testing/mozharness/scripts/release/antivirus.py index b40dc5cc01..a28c3fd2f5 100644 --- a/testing/mozharness/scripts/release/antivirus.py +++ b/testing/mozharness/scripts/release/antivirus.py @@ -69,7 +69,6 @@ class AntivirusScan(BaseScript, VirtualenvMixin): r"^.*json$", r"^.*/host.*$", r"^.*/mar-tools/.*$", - r"^.*robocop.apk$", r"^.*contrib.*" ] CACHE_DIR = 'cache' diff --git a/testing/mozharness/scripts/release/beet_mover.py b/testing/mozharness/scripts/release/beet_mover.py index adc8b19e11..0f3c187530 100755 --- a/testing/mozharness/scripts/release/beet_mover.py +++ b/testing/mozharness/scripts/release/beet_mover.py @@ -107,7 +107,6 @@ DEFAULT_EXCLUDES = [ r"^.*json$", r"^.*/host.*$", r"^.*/mar-tools/.*$", - r"^.*robocop.apk$", r"^.*contrib.*" ] CACHE_DIR = 'cache' diff --git a/testing/mozharness/scripts/release/push-candidate-to-releases.py b/testing/mozharness/scripts/release/push-candidate-to-releases.py index 5339fa38a8..977a26c481 100644 --- a/testing/mozharness/scripts/release/push-candidate-to-releases.py +++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py @@ -48,7 +48,6 @@ class ReleasePusher(BaseScript, VirtualenvMixin): r"^.*json$", r"^.*/host.*$", r"^.*/mar-tools/.*$", - r"^.*robocop.apk$", r"^.*bouncer.apk$", r"^.*contrib.*", r"^.*/beetmover-checksums/.*$", |