[checkmk-commits] Fixed permission issue after refactoring

Module: check_mk Branch: master Commit: df32f710975a1768347905956baa6d7a13185bea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df32f710975a17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 08:49:02 2018 +0100 Fixed permission issue after refactoring Change-Id: Icaada477643d1090b4f515cd13aeaff47f5cb5da --- omd/packages/omd/omdlib/main.py | 2 ++ tests/unit/omdlib/test_main.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index d56cf17..3138db8 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -654,6 +654,7 @@ g_skel_permissions = {} # type: Dict[str, int] def read_skel_permissions(): + global g_skel_permissions g_skel_permissions = load_skel_permissions(omdlib.__version__) if not g_skel_permissions: bail_out("%s is missing or currupted." % skel_permissions_file_path(omdlib.__version__)) @@ -2883,6 +2884,7 @@ def main_enable(site, args, options): def set_conflict_option(options): + global opt_conflict opt_conflict = options.get("conflict", "ask") if opt_conflict not in ["ask", "install", "keepold", "abort"]: diff --git a/tests/unit/omdlib/test_main.py b/tests/unit/omdlib/test_main.py new file mode 100644 index 0000000..fba7420 --- /dev/null +++ b/tests/unit/omdlib/test_main.py @@ -0,0 +1,14 @@ +from pathlib2 import Path + +import omdlib.main + + +def test_read_skel_permissions(monkeypatch, tmpdir): + tmp_path = Path("%s" % tmpdir) + pfile = tmp_path / "skel.permissions" + pfile.open("w", encoding="utf-8").write(u"bla 755\nblub 644\n") # pylint: disable=no-member + + monkeypatch.setattr(omdlib.main, "skel_permissions_file_path", lambda v: "%s" % (pfile)) + + omdlib.main.read_skel_permissions() + assert omdlib.main.g_skel_permissions == {'bla': 493, 'blub': 420}