Merge pull request #8074 from tchaikov/wip-ceph-detect-init-test

ceph-detect-init: add debian/jessie test Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Mar 13, 2016 · e530ade · e530ade
2 parents 1d685bb + 7c62ddf
commit e530ade
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/ceph-detect-init/ceph_detect_init/debian/__init__.py b/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
@@ -14,9 +14,8 @@ def choose_init():
             return 'systemd'
         else:
             return 'upstart'
-    if distro.lower() in ('debian'):
+    if distro.lower() == 'debian':
         if codename in ('squeeze', 'wheezy'):
             return 'sysvinit'
         else:
             return 'systemd'
-    return 'sysvinit'
diff --git a/src/ceph-detect-init/tests/test_all.py b/src/ceph-detect-init/tests/test_all.py
@@ -48,6 +48,10 @@ def test_debian(self):
                                  distro='debian',
                                  codename='wheezy'):
             self.assertEqual('sysvinit', debian.choose_init())
+        with mock.patch.multiple('ceph_detect_init.debian',
+                                 distro='debian',
+                                 codename='jessie'):
+            self.assertEqual('systemd', debian.choose_init())
         with mock.patch.multiple('ceph_detect_init.debian',
                                  distro='ubuntu',
                                  codename='trusty'):
@@ -56,6 +60,10 @@ def test_debian(self):
                                  distro='ubuntu',
                                  codename='vivid'):
             self.assertEqual('systemd', debian.choose_init())
+        with mock.patch.multiple('ceph_detect_init.debian',
+                                 distro='not-debian',
+                                 codename='andy'):
+            self.assertIs(None, debian.choose_init())
 
     def test_fedora(self):
         with mock.patch('ceph_detect_init.fedora.release',