diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-05 05:02:54 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-05 05:02:54 +0000 |
| commit | 21276997e8191aedf1dfa16ac37653f7c1da8b8a (patch) | |
| tree | fe309af7b25184a61cb5c72c02ffb060a68ec434 | |
| parent | 5a532330c10031bc768d17f2e3ce7ee065b887e6 (diff) | |
| parent | 07f16d9b6770c05f59e7e0a72332814839face50 (diff) | |
| download | buildstream-21276997e8191aedf1dfa16ac37653f7c1da8b8a.tar.gz | |
Merge branch 'tristan/optional-coverage-fixup' into 'master'
Fixes for coverage optionality
See merge request BuildStream/buildstream!1206
| -rw-r--r-- | requirements/Makefile | 4 | ||||
| -rw-r--r-- | tests/testutils/artifactshare.py | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/requirements/Makefile b/requirements/Makefile index 69b6c7432..2c4a9f0a9 100644 --- a/requirements/Makefile +++ b/requirements/Makefile @@ -16,8 +16,8 @@ all: $(REQUIREMENTS_TXT) %.txt: %.in FORCE $(eval VENVDIR := $(shell mktemp -d $(CURDIR)/.bst-venv.XXXXXX)) $(VENV) $(VENVDIR) - $(VENV_PIP) install -r $^ - $(VENV_PIP) freeze -r $^ | grep -v pkg-resources > $@ + $(VENV_PIP) install -r $< + $(VENV_PIP) freeze -r $< | grep -v pkg-resources > $@ rm -rf $(VENVDIR) FORCE: diff --git a/tests/testutils/artifactshare.py b/tests/testutils/artifactshare.py index 41673ca1d..0fca42a6c 100644 --- a/tests/testutils/artifactshare.py +++ b/tests/testutils/artifactshare.py @@ -6,7 +6,6 @@ from collections import namedtuple from contextlib import contextmanager from multiprocessing import Process, Queue -import pytest_cov from buildstream._cas import CASCache from buildstream._cas.casserver import create_server @@ -68,7 +67,13 @@ class ArtifactShare(): # Run the artifact server. # def run(self, q): - pytest_cov.embed.cleanup_on_sigterm() + + try: + import pytest_cov + except ImportError: + pass + else: + pytest_cov.embed.cleanup_on_sigterm() try: # Optionally mock statvfs |