Bug 1144573 - Cleanup after removing android*.json. r=ahal, r=jmaher
authorVaibhav Agrawal <vaibhavmagarwal@gmail.com>
Thu, 26 Mar 2015 14:39:57 +0800
changeset 266328 37b979f090551cdd29e3f7a5120c22c05224e268
parent 266327 288a5197ce2a7bd51682ff009a12a9e830bd3b0e
child 266329 11bc172a86653ecbea234f99045c77a7ac13894e
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal, jmaher
bugs1144573
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1144573 - Cleanup after removing android*.json. r=ahal, r=jmaher CLOSED TREE
testing/mochitest/mochitest_options.py
testing/mochitest/runtests.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -287,30 +287,16 @@ class MochitestOptions(optparse.OptionPa
           }],
         [["--run-until-failure"],
          {"action": "store_true",
           "dest": "runUntilFailure",
           "help": "Run tests repeatedly and stops on the first time a test fails. "
           "Default cap is 30 runs, which can be overwritten with the --repeat parameter.",
           "default": False,
           }],
-        [["--run-only-tests"],
-         {"action": "store",
-          "type": "string",
-          "dest": "runOnlyTests",
-          "help": "JSON list of tests that we only want to run. [DEPRECATED- please use --test-manifest]",
-          "default": None,
-          }],
-        [["--test-manifest"],
-         {"action": "store",
-          "type": "string",
-          "dest": "testManifest",
-          "help": "JSON list of tests to specify 'runtests'. Old format for mobile specific tests",
-          "default": None,
-          }],
         [["--manifest"],
          {"action": "store",
           "type": "string",
           "dest": "manifestFile",
           "help": ".ini format of tests to run.",
           "default": None,
           }],
         [["--testrun-manifest-file"],
@@ -580,37 +566,16 @@ class MochitestOptions(optparse.OptionPa
                 self.error(
                     "use-vmware-recording is only supported on Windows.")
             mochitest.vmwareHelperPath = os.path.join(
                 options.utilityPath, VMWARE_RECORDING_HELPER_BASENAME + ".dll")
             if not os.path.exists(mochitest.vmwareHelperPath):
                 self.error("%s not found, cannot automate VMware recording." %
                            mochitest.vmwareHelperPath)
 
-        if options.testManifest and options.runOnlyTests:
-            self.error(
-                "Please use --test-manifest only and not --run-only-tests")
-
-        if options.runOnlyTests:
-            if not os.path.exists(
-                os.path.abspath(
-                    os.path.join(
-                        here,
-                        options.runOnlyTests))):
-                self.error(
-                    "unable to find --run-only-tests file '%s'" %
-                    options.runOnlyTests)
-            options.runOnly = True
-            options.testManifest = options.runOnlyTests
-            options.runOnlyTests = None
-
-        if options.manifestFile and options.testManifest:
-            self.error(
-                "Unable to support both --manifest and --test-manifest/--run-only-tests at the same time")
-
         if options.webapprtContent and options.webapprtChrome:
             self.error(
                 "Only one of --webapprt-content and --webapprt-chrome may be given.")
 
         if options.jsdebugger:
             options.extraPrefs += [
                 "devtools.debugger.remote-enabled=true",
                 "devtools.debugger.chrome-enabled=true",
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1875,49 +1875,21 @@ class Mochitest(MochitestUtilsMixin):
                 # test manifests, even though they aren't tests. This gross
                 # hack causes several problems in automation including
                 # throwing off the chunking numbers. Remove them manually
                 # until bug 1089034 is fixed.
                 def remove_imptest_failure_expectations(tests, values):
                     return (t for t in tests
                             if 'imptests/failures' not in t['path'])
 
-                # filter that implements old-style JSON manifests, remove
-                # once everything is using .ini
-                def apply_json_manifest(tests, values):
-                    m = os.path.join(SCRIPT_DIR, options.testManifest)
-                    with open(m, 'r') as f:
-                        m = json.loads(f.read())
-
-                    runtests = m.get('runtests')
-                    exctests = m.get('excludetests')
-                    if runtests is None and exctests is None:
-                        if options.runOnly:
-                            runtests = m
-                        else:
-                            exctests = m
-
-                    disabled = 'disabled by {}'.format(options.testManifest)
-                    for t in tests:
-                        if runtests and not any(t['relpath'].startswith(r)
-                                                for r in runtests):
-                            t['disabled'] = disabled
-                        if exctests and any(t['relpath'].startswith(r)
-                                            for r in exctests):
-                            t['disabled'] = disabled
-                        yield t
-
                 filters = [
                     remove_imptest_failure_expectations,
                     subsuite(options.subsuite),
                 ]
 
-                if options.testManifest:
-                    filters.append(apply_json_manifest)
-
                 # Add chunking filters if specified
                 if options.chunkByDir:
                     filters.append(chunk_by_dir(options.thisChunk,
                                                 options.totalChunks,
                                                 options.chunkByDir))
                 elif options.totalChunks:
                     filters.append(chunk_by_slice(options.thisChunk,
                                                   options.totalChunks))