[checkmk-commits] tests: Load enterprise files from new location

Module: check_mk Branch: master Commit: 66edefb0257c87934e26ed552c4b7452a6a1e1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66edefb0257c87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 12:26:33 2017 +0100 tests: Load enterprise files from new location Change-Id: I2f3442c0a883f682aaf57b62b866c1a854c3c54a --- tests/testlib/__init__.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index e626014..f3ae0f6 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -34,7 +34,7 @@ def cmk_path(): def cmc_path(): - return os.path.realpath(repo_path() + "/../cmc") + return repo_path() + "/enterprise" # Directory for persisting variable data produced by tests @@ -292,20 +292,23 @@ class Site(object): cmk_path() + "/livestatus", cmk_path() + "/livestatus/api/python", cmk_path() + "/.werks", - - 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", ] + if os.path.exists(cmc_path()): + paths += [ + 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)