From e5f5f50a1ce26ad00430a162eca04a6c62dccb5f Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 10 Sep 2018 11:29:54 -0400 Subject: [PATCH 1/2] Always use parallel for coverage measurement --- .coveragerc | 1 + openedx/core/lib/.coveragerc | 1 + 2 files changed, 2 insertions(+) diff --git a/.coveragerc b/.coveragerc index 6f8d8121fb..a15cc07421 100644 --- a/.coveragerc +++ b/.coveragerc @@ -29,6 +29,7 @@ omit = openedx/features/*/migrations/* concurrency=multiprocessing +parallel = true [report] ignore_errors = True diff --git a/openedx/core/lib/.coveragerc b/openedx/core/lib/.coveragerc index 66670270be..87fbc1aa6c 100644 --- a/openedx/core/lib/.coveragerc +++ b/openedx/core/lib/.coveragerc @@ -2,6 +2,7 @@ [run] data_file = reports/openedx/core/lib/.coverage source = openedx/core/lib +parallel = true [report] ignore_errors = True From f51cfc1a88875cc0cd940542d337818f105af624 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 10 Sep 2018 11:30:06 -0400 Subject: [PATCH 2/2] Explain the pytest-cov pin --- requirements/edx/testing.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index e066bd157a..f142734231 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -36,7 +36,7 @@ pyquery # jQuery-like API for retrieving fragments of HTML and pysqlite # DB-API 2.0 interface for SQLite 3.x (used as the relational database for most tests) pytest==3.6.3 # Testing framework # Pinned due to https://github.com/pytest-dev/pytest/issues/3749 pytest-attrib # Select tests based on attributes -pytest-cov<2.6 # pytest plugin for measuring code coverage +pytest-cov<2.6 # pytest plugin for measuring code coverage. # Pinned due to https://openedx.atlassian.net/browse/TE-2731 pytest-django==3.1.2 # Django support for pytest pytest-randomly # pytest plugin to randomly order tests pytest-xdist # Parallel execution of tests on multiple CPU cores or hosts