restore pytest.ini parallel mode

python · Jun 12, 2018 · 5f68d9e · 5f68d9e
1 parent 8550ced
commit 5f68d9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -19,3 +19,6 @@ python_files = test*.py
 python_classes =
 python_functions =
 
+# always run in parallel (requires pytest-xdist, see test-requirements.txt)
+addopts = -nauto
+
diff --git a/runtests.py b/runtests.py
@@ -83,11 +83,10 @@ def add_pytest(self, files: List[Tuple[str, str]], coverage: bool = True) -> Non
         if not pytest_files:
             return
         pytest_args = pytest_files + self.arglist + self.pyt_arglist
-        always_append = ['-n', 'auto', '--cov-append', '--cov-report=']
         if coverage and self.coverage:
-            args = [sys.executable, '-m', 'pytest', '--cov=mypy'] + always_append + pytest_args
+            args = [sys.executable, '-m', 'pytest', '--cov=mypy'] + pytest_args
         else:
-            args = [sys.executable, '-m', 'pytest', ] + always_append + pytest_args
+            args = [sys.executable, '-m', 'pytest'] + pytest_args
 
         self.waiter.add(LazySubprocess('pytest', args, env=self.env,
                                        passthrough=self.verbosity),