# HG changeset patch
# User Andrew Halberstadt <ahalberstadt@mozilla.com>
# Date 1522877422 14400
# Node ID 2c991efc5c9c5d244ebfeada19acaed9b31f2e29
# Parent  b5d3e1895038096555d8198e832478e0916efcb6
Bug 1451501 - Fix error trying to run python-tests via |mach test|, r=gps,whimboo

MozReview-Commit-ID: LNedxcqQ1NC

diff --git a/python/mach_commands.py b/python/mach_commands.py
--- a/python/mach_commands.py
+++ b/python/mach_commands.py
@@ -81,40 +81,34 @@ class MachCommands(MachCommandBase):
         try:
             tempdir = os.environ[b'PYTHON_TEST_TMP'] = str(tempfile.mkdtemp(suffix='-python-test'))
             return self.run_python_tests(*args, **kwargs)
         finally:
             import mozfile
             mozfile.remove(tempdir)
 
     def run_python_tests(self,
-                         tests=[],
+                         tests=None,
                          test_objects=None,
                          subsuite=None,
                          verbose=False,
                          jobs=1,
                          **kwargs):
         self._activate_virtualenv()
 
-        # Python's unittest, and in particular discover, has problems with
-        # clashing namespaces when importing multiple test modules. What follows
-        # is a simple way to keep environments separate, at the price of
-        # launching Python multiple times. Most tests are run via mozunit,
-        # which produces output in the format Mozilla infrastructure expects.
-        # Some tests are run via pytest.
         if test_objects is None:
-            from mozbuild.testing import TestResolver
+            from moztest.resolve import TestResolver
             resolver = self._spawn(TestResolver)
-            if tests:
-                # If we were given test paths, try to find tests matching them.
-                test_objects = resolver.resolve_tests(paths=tests,
-                                                      flavor='python')
-            else:
-                # Otherwise just run everything in PYTHON_UNITTEST_MANIFESTS
-                test_objects = resolver.resolve_tests(flavor='python')
+            # If we were given test paths, try to find tests matching them.
+            test_objects = resolver.resolve_tests(paths=tests, flavor='python')
+        else:
+            # We've received test_objects from |mach test|. We need to ignore
+            # the subsuite because python-tests don't use this key like other
+            # harnesses do and |mach test| doesn't realize this.
+            subsuite = None
 
         mp = TestManifest()
         mp.tests.extend(test_objects)
 
         filters = []
         if subsuite == 'default':
             filters.append(mpf.subsuite(None))
         elif subsuite: