9 Nov
2016
9 Nov
'16
8:11 a.m.
Module: check_mk
Branch: master
Commit: e0ae21a0e37dc7b63be93e82fdeff002c789ea33
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ae21a0e37dc7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 9 14:11:05 2016 +0100
Tests can now choose to use the current git state for testing
---
tests/testlib/__init__.py | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py
index 4ebcd35..5f7e46d 100644
--- a/tests/testlib/__init__.py
+++ b/tests/testlib/__init__.py
@@ -54,6 +54,7 @@ def omd(cmd):
class CMKVersion(object):
DEFAULT = "default"
DAILY = "daily"
+ GIT = "git"
CEE = "cee"
CRE = "cre"
@@ -77,7 +78,7 @@ class CMKVersion(object):
def set_version(self, version):
- if version == CMKVersion.DAILY:
+ if version in [ CMKVersion.DAILY, CMKVersion.GIT ]:
self.version = time.strftime("%Y.%m.%d")
elif version == CMKVersion.DEFAULT:
@@ -148,6 +149,8 @@ class Site(object):
self.root = "/omd/sites/%s" % self.id
self.version = CMKVersion(version, edition)
+ self.update_with_git = version == CMKVersion.GIT
+
self.reuse = reuse
self.http_proto = "http"
@@ -220,6 +223,41 @@ class Site(object):
assert omd(["-V", self.version.version_directory(),
"create", self.id]) == 0
assert os.path.exists("/omd/sites/%s" % self.id)
+ if self.update_with_git:
+ self._update_with_f12_files()
+
+
+ def _update_with_f12_files(self):
+ paths = [
+ cmc_path() + "/bin",
+ cmk_path() + "/modules",
+ cmc_path() + "/cmk_base",
+ cmc_path() + "/cmk",
+ cmk_path() + "/checks",
+ cmk_path() + "/checkman",
+ cmk_path() + "/web",
+ cmk_path() + "/inventory",
+ cmk_path() + "/notifications",
+ cmk_path() + "/livestatus",
+
+ cmc_path() + "/bin",
+ cmc_path() + "/modules",
+ cmc_path() + "/cmk_base",
+ cmc_path() + "/cmk",
+ cmc_path() + "/web",
+ cmc_path() + "/alert_handlers",
+ cmc_path() + "/misc",
+ cmc_path() + "/core",
+ cmc_path() + "/agents/bakery",
+ cmc_path() + "/agents/plugins",
+ cmc_path() + "/agents",
+ ]
+
+ for path in paths:
+ if os.path.exists("%s/.f12" % path):
+ print("Executing .f12 in %s" % path)
+ assert os.system("cd %s ; ONLY_COPY=1 bash .f12" % path)
>> 8 == 0
+
def rm_if_not_reusing(self):
if not self.reuse: