Module: check_mk
Branch: master
Commit: 66c091da7f72f7d05d8feb41b946a7de72c23f64
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c091da7f72f7…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Thu Jan 25 15:45:01 2018 +0100
Fix pytest ImportMismatchError
Try to rm -rf __pycache__ as the option --cache-clear did not seem to
help or did its job too late.
---
agents/windows/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am
index 13b65f3..5ebd491 100644
--- a/agents/windows/Makefile.am
+++ b/agents/windows/Makefile.am
@@ -16,7 +16,7 @@ WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock
$(LD_COMMON)
wmitest_LDADD = $(LD_COMMON)
pytest = /usr/bin/env pytest
-pytest_options = --cache-clear --maxfail=10
+pytest_options = --maxfail=10
pytest_jenkins = $(pytest_options) --junitxml=$$WORKSPACE/results/junit.xml
build_version: $(check_mk_agent_SOURCES:.cc=.o)
@@ -41,6 +41,7 @@ unittest: WindowsAgentTest$(EXEEXT)
integrationtest: install-strip
cd $(bindir)/it ; \
rm -f remote.pyc ; \
+ rm -rf __pycache__ ; \
if [[ $$SUDO_USER == jenkins ]] ; then \
$(pytest) $(pytest_jenkins) ; \
else \