[checkmk-commits] Fixed branch check when having spaces in path

Module: check_mk Branch: master Commit: 68a8fab2e83b27f2f557ccf2ae3cdbe90d41d98f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68a8fab2e83b27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 11:35:32 2016 +0200 Fixed branch check when having spaces in path --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index bc8865b..47ca8f8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,8 +33,8 @@ def add_python_paths(): # Some pre-testing to ensure the developer uses the correct branches in all involved repos def ensure_equal_branches(): - cmk_branch = os.popen("cd %s ; git rev-parse --abbrev-ref HEAD" % cmk_path()).read().strip() - cmc_branch = os.popen("cd %s ; git rev-parse --abbrev-ref HEAD" % cmc_path()).read().strip() + cmk_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmk_path()).read().strip() + cmc_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmc_path()).read().strip() assert cmk_branch == cmc_branch, "Different branches (%s != %s)\n" % (cmk_branch, cmc_branch)