From 2a955375dbf0d546d8999793923c4e8f23e042c6 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Wed, 3 Jun 2015 13:16:23 -0400
Subject: transform paths in functions taking more than a single argument

Patch FilesystemMockingTestcase.patchOS to support methods taking more
than a single path argument.  This is required in order to properly mock
`os.symlink`, which takes two path arguments.
---
 tests/unittests/helpers.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 61a1f6ff..7f4b8784 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -248,13 +248,15 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
 
     def patchOS(self, new_root):
         patch_funcs = {
-            os.path: ['isfile', 'exists', 'islink', 'isdir'],
-            os: ['listdir'],
+            os.path: [('isfile', 1), ('exists', 1),
+                      ('islink', 1), ('isdir', 1)],
+            os: [('listdir', 1), ('mkdir', 1),
+                 ('lstat', 1), ('symlink', 2)],
         }
         for (mod, funcs) in patch_funcs.items():
-            for f in funcs:
+            for f, nargs in funcs:
                 func = getattr(mod, f)
-                trap_func = retarget_many_wrapper(new_root, 1, func)
+                trap_func = retarget_many_wrapper(new_root, nargs, func)
                 self.patched_funcs.enter_context(
                     mock.patch.object(mod, f, trap_func))
 
-- 
cgit v1.2.3


From 8db399f9149a81de5d65f0759792766ecd509ab3 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Wed, 3 Jun 2015 13:18:38 -0400
Subject: add tests for systemd detection

This adds the following tests in test_distros.test_generic:

- test_systemd_in_use

  Test the situation in which /run/systemd/system exists.

- test_systemd_not_in_use

  Test the situation in which /run/systemd/system does not exists.

- test_systemd_symlink

  This tests the situation in which /run/systemd/system exists but is a
  *symlink* to a directory, which according to sd_booted() should return
  false.
---
 tests/unittests/test_distros/test_generic.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'tests')

diff --git a/tests/unittests/test_distros/test_generic.py b/tests/unittests/test_distros/test_generic.py
index 35153f0d..8e3bd78a 100644
--- a/tests/unittests/test_distros/test_generic.py
+++ b/tests/unittests/test_distros/test_generic.py
@@ -194,6 +194,29 @@ class TestGenericDistro(helpers.FilesystemMockingTestCase):
                          {'primary': 'http://fs-primary-intel',
                           'security': 'http://security-mirror2-intel'})
 
+    def test_systemd_in_use(self):
+        cls = distros.fetch("ubuntu")
+        d = cls("ubuntu", {}, None)
+        self.patchOS(self.tmp)
+        self.patchUtils(self.tmp)
+        os.makedirs('/run/systemd/system')
+        self.assertTrue(d.uses_systemd())
+
+    def test_systemd_not_in_use(self):
+        cls = distros.fetch("ubuntu")
+        d = cls("ubuntu", {}, None)
+        self.patchOS(self.tmp)
+        self.patchUtils(self.tmp)
+        self.assertFalse(d.uses_systemd())
+
+    def test_systemd_symlink(self):
+        cls = distros.fetch("ubuntu")
+        d = cls("ubuntu", {}, None)
+        self.patchOS(self.tmp)
+        self.patchUtils(self.tmp)
+        os.makedirs('/run/systemd')
+        os.symlink('/', '/run/systemd/system')
+        self.assertFalse(d.uses_systemd())
 
 # def _get_package_mirror_info(mirror_info, availability_zone=None,
 #                             mirror_filter=util.search_for_mirror):
-- 
cgit v1.2.3