Module: check_mk
Branch: master
Commit: bed0408d82f6a88ff8f9be589ba45a4ed2988f0d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bed0408d82f6a8…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 1 09:55:15 2019 +0100
pytest: Do not print out captured outputs by default
Change-Id: Ided548215e29c8ba0df4941a9ad844293af52fe2
---
pytest.ini | 2 +-
tests/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pytest.ini b/pytest.ini
index 915adc5..501ac70 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,7 +3,7 @@ testpaths = tests
# -p no:cacheprovider -> Disable caching. This is needed to make the
# integration tests work which are executed as site user.
# --durations=10: Show the 10 slowest tests
-addopts = -p no:stepwise -p no:cacheprovider -rs -v --maxfail=1 --durations=10
+addopts = -p no:stepwise -p no:cacheprovider -r -v --maxfail=1 --durations=10
# Register some markers to classify the tests
# TODO: Are they used? Clean them up
markers =
diff --git a/tests/Makefile b/tests/Makefile
index 00b701d..9f376ba 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,7 +4,7 @@ NODE_MODULES := ../node_modules
PIPENV := PIPENV_VENV_IN_PROJECT=true pipenv
BANDIT := $(PIPENV) run bandit
COVERAGE := $(PIPENV) run coverage
-PYTEST := $(PIPENV) run py.test -s -vv
+PYTEST := $(PIPENV) run py.test -vv
YAPF := $(PIPENV) run yapf
.PHONY: help pipenv-check test-bandit test-docker test-format-python \