From: Kefu Chai <kchai@redhat.com>
Date: Sun, 13 Mar 2016 02:21:27 +0000 (+0800)
Subject: ceph-detect-init: return None at seeing unknown debian distro
X-Git-Tag: v10.1.0~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c62ddf5239ad22541c46aac1f1b65db8f50bb5c;p=ceph.git

ceph-detect-init: return None at seeing unknown debian distro

* return None at seeing unknown debian distros
* add test for this accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/ceph-detect-init/ceph_detect_init/debian/__init__.py b/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
index 2c0cdb8ef324..73a7851a3fc9 100644
--- 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
index f444eebb9f79..c13b12b7364d 100644
--- a/src/ceph-detect-init/tests/test_all.py
+++ b/src/ceph-detect-init/tests/test_all.py
@@ -48,6 +48,10 @@ class TestCephDetectInit(testtools.TestCase):
                                  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 @@ class TestCephDetectInit(testtools.TestCase):
                                  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',