Module: check_mk
Branch: master
Commit: f0f606fbc93515adb0f3a21c74d308fdcc94320e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0f606fbc93515…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jan 14 07:28:02 2019 +0100
Make pytest show the 10 slowest tests after completion
Change-Id: Id3831af5943306b978db32dc99c5ccc7b3077ed8
---
pytest.ini | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pytest.ini b/pytest.ini
index 88b64f4..7e85fa6 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,7 +2,8 @@
testpaths = tests
# -p no:cacheprovider -> Disable caching. This is needed to make the
# integration tests work which are executed as site user.
-addopts = -p no:stepwise -p no:cacheprovider -rs -v --maxfail=1
+# --durations=10: Show the 10 slowest tests
+addopts = -p no:stepwise -p no:cacheprovider -rs -v --maxfail=1 --durations=10
# Register some markers to classify the tests
# TODO: Are they used? Clean them up
markers =
Module: check_mk
Branch: master
Commit: c25f1e0f6fa9db0144ef66e9f2bb6644171de956
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25f1e0f6fa9db…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sat Jan 12 13:36:31 2019 +0100
Revert "Fix daily build"
This reverts commit cf5d78f341cee81fb5ee5bdc10506c3a6dfdcf30.
---
docker/Makefile | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/docker/Makefile b/docker/Makefile
index 64f8f82..dd52782 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -49,16 +49,8 @@ setup:
setversion:
sed -i 's/^ARG CMK_VERSION=.*$$/ARG CMK_VERSION="$(NEW_VERSION)"/g' Dockerfile
-# When executed by tests/docker/test_docker.py the update test creates a
-# 1.5.0 container which needs the distro file from the 1.5.0 branch. In
-# other build cases (e.g. during daily builds) we only have a source tar
-# and no git repository. In this case simply use the available distro file.
distro-%.mk:
- if [ -d ../.git ]; then \
- git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ ; \
- else \
- cp ../omd/distros/DEBIAN_9.mk $@ ; \
- fi
+ git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@
needed-packages-%: distro-%.mk
echo -e '$@:\n\t@echo \$$(OS_PACKAGES) > $@\n' | \
Module: check_mk
Branch: master
Commit: cf5d78f341cee81fb5ee5bdc10506c3a6dfdcf30
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5d78f341cee8…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sat Jan 12 09:07:27 2019 +0100
Fix daily build
Change-Id: I6d5bcad98cb97887588b34f896df5d71dca8363e
---
docker/Makefile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/docker/Makefile b/docker/Makefile
index dd52782..64f8f82 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -49,8 +49,16 @@ setup:
setversion:
sed -i 's/^ARG CMK_VERSION=.*$$/ARG CMK_VERSION="$(NEW_VERSION)"/g' Dockerfile
+# When executed by tests/docker/test_docker.py the update test creates a
+# 1.5.0 container which needs the distro file from the 1.5.0 branch. In
+# other build cases (e.g. during daily builds) we only have a source tar
+# and no git repository. In this case simply use the available distro file.
distro-%.mk:
- git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@
+ if [ -d ../.git ]; then \
+ git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ ; \
+ else \
+ cp ../omd/distros/DEBIAN_9.mk $@ ; \
+ fi
needed-packages-%: distro-%.mk
echo -e '$@:\n\t@echo \$$(OS_PACKAGES) > $@\n' | \