Backed out changeset 15f725097416 (bug 1504308) for python related build bustages CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Wed, 03 Apr 2019 00:07:48 +0300
changeset 467654 71a1c61543e49af28e83e9d1b7f46e822cf4af9b
parent 467653 f0df19a1280a8722a23e148197208cb557689686
child 467655 576e8aa7f48ce4bc64a9fa64a7459b030fa8bcd4
push id35806
push userrgurzau@mozilla.com
push dateWed, 03 Apr 2019 04:07:39 +0000
treeherdermozilla-central@45808ab18609 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1504308
milestone68.0a1
backs out15f725097416d14b300e407d11f3dcda726ca337
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
Backed out changeset 15f725097416 (bug 1504308) for python related build bustages CLOSED TREE
python/mach_commands.py
--- a/python/mach_commands.py
+++ b/python/mach_commands.py
@@ -71,16 +71,17 @@ class MachCommands(MachCommandBase):
 
     @Command('python-test', category='testing',
              description='Run Python unit tests with an appropriate test runner.')
     @CommandArgument('-v', '--verbose',
                      default=False,
                      action='store_true',
                      help='Verbose output.')
     @CommandArgument('--python',
+                     default='2.7',
                      help='Version of Python for Pipenv to use. When given a '
                           'Python version, Pipenv will automatically scan your '
                           'system for a Python that matches that given version.')
     @CommandArgument('-j', '--jobs',
                      default=None,
                      type=int,
                      help='Number of concurrent jobs to run. Default is the number of CPUs '
                           'in the system.')
@@ -103,17 +104,16 @@ class MachCommands(MachCommandBase):
     def run_python_tests(self,
                          tests=None,
                          test_objects=None,
                          subsuite=None,
                          verbose=False,
                          jobs=None,
                          python=None,
                          **kwargs):
-        python = python or self.virtualenv_manager.python_path
         self.activate_pipenv(pipfile=None, populate=True, python=python)
 
         if test_objects is None:
             from moztest.resolve import TestResolver
             resolver = self._spawn(TestResolver)
             # If we were given test paths, try to find tests matching them.
             test_objects = resolver.resolve_tests(paths=tests, flavor='python')
         else: