[checkmk-commits] More logging during test version copying

Module: check_mk Branch: master Commit: 527969938d6c57a5ee15ebec97ccce794b6eaa3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527969938d6c57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 11:53:48 2017 +0200 More logging during test version copying Change-Id: Id1682eec33352190b0278e35fcf239c4ed03eb0a --- tests/testlib/__init__.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3f7cf81..2a26a3a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -331,22 +331,22 @@ class Site(object): assert not os.path.exists(self.version.version_path()), \ "New version path '%s' already exists" % self.version.version_path() - cmd = "sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path()) - if os.system(cmd) >> 8 != 0: - raise Exception("Failed to copy Check_MK: %s" % cmd) + def execute(cmd): + print("Executing: %s" % cmd) + rc = os.system(cmd) >> 8 + if rc != 0: + raise Exception("Failed to execute '%s'. Exit code: %d" % (cmd, rc)) + + execute("sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path())) - if os.system("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % - (src_version, new_version_name, self.version.version_path())) >> 8 != 0: - raise Exception("Failed to set new version to bin/omd") + execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % + (src_version, new_version_name, self.version.version_path())) - if os.system("sudo chrpath -r %s/lib %s/bin/python" % - (self.root, self.version.version_path())) >> 8 != 0: - raise Exception("Failed to set new version to bin/python") + execute("sudo chrpath -r %s/lib %s/bin/python" % + (self.root, self.version.version_path())) - if os.system("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " - "%s/share/check_mk/web/htdocs/index.py" % - (self.version.version_path(), self.version.version_path())) >> 8 != 0: - raise Exception("Failed to add python module path of fake version") + execute("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " \ + "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) def _update_with_f12_files(self):