[checkmk-commits] tests: optionally cleanup old test sites

Module: check_mk Branch: master Commit: 9ca5570468e291a858e3228a5fd347f97611a730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca5570468e291… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 28 14:38:04 2016 +0200 tests: optionally cleanup old test sites --- tests/conftest.py | 5 +++++ tests/testlib/__init__.py | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 47ca8f8..79c83c2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -93,6 +93,11 @@ def site(request): site = testlib.Site(site_id=site_id(), version=site_version(), edition=site_edition(), reuse=reuse_site()) + + cleanup_pattern = os.environ.get("CLEANUP_OLD") + if cleanup_pattern: + site.cleanup_old_sites(cleanup_pattern) + site.cleanup_if_wrong_version() site.create() site.open_livestatus_tcp() diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 7a0593f..f6b5dd2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -226,8 +226,17 @@ class Site(object): self.rm() - def rm(self): - assert omd(["-f", "rm", "--kill", self.id]) == 0 + def rm(self, site_id=None): + if site_id == None: + site_id = self.id + assert omd(["-f", "rm", "--kill", site_id]) == 0 + + + def cleanup_old_sites(self, cleanup_pattern): + for site_id in os.listdir("/omd/sites"): + if site_id != site.id() and site_id.startswith(cleanup_pattern): + print "Cleaning up old site: %s" % site_id + #self.rm(site_id) def start(self):