From: John Coyle <dx9err@gmail.com>
Date: Thu, 9 Jun 2016 23:59:54 +0000 (-0400)
Subject: ceph_detect_init/__init__.py: Define alpine as a supported distro when using platform... 
X-Git-Tag: v11.1.0~570^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fb666c04de1d2ea7d102a52b40e0d4f8722c350;p=ceph.git

ceph_detect_init/__init__.py: Define alpine as a supported distro when using platform.linux_distribution().

Python does not define alpine as a supported dist.

https://hg.python.org/cpython/file/default/Lib/platform.py#l268

Signed-off-by: John Coyle <dx9err@gmail.com>
---

diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py
index 46f6a1d9262a..71e31bb48540 100644
--- a/src/ceph-detect-init/ceph_detect_init/__init__.py
+++ b/src/ceph-detect-init/ceph_detect_init/__init__.py
@@ -88,9 +88,11 @@ def _normalized_distro_name(distro):
 
 def platform_information():
     """detect platform information from remote host."""
+    linux_distro = platform.linux_distribution(
+        supported_dists=platform._supported_dists + ('alpine',))
     logging.debug('platform_information: linux_distribution = ' +
-                  str(platform.linux_distribution()))
-    distro, release, codename = platform.linux_distribution()
+                  str(linux_distro))
+    distro, release, codename = linux_distro
     # this could be an empty string in Debian
     if not codename and 'debian' in distro.lower():
         debian_codenames = {
diff --git a/src/ceph-detect-init/tests/test_all.py b/src/ceph-detect-init/tests/test_all.py
index 7d2c4628ed8f..a33b3251b4b5 100644
--- a/src/ceph-detect-init/tests/test_all.py
+++ b/src/ceph-detect-init/tests/test_all.py
@@ -143,7 +143,7 @@ class TestCephDetectInit(testtools.TestCase):
     def test_get(self):
         g = ceph_detect_init.get
         with mock.patch('platform.linux_distribution',
-                        lambda: (('unknown', '', ''))):
+                        lambda **kwargs: (('unknown', '', ''))):
             self.assertRaises(exc.UnsupportedPlatform, g)
             try:
                 g()
@@ -151,7 +151,7 @@ class TestCephDetectInit(testtools.TestCase):
                 self.assertIn('Platform is not supported', str(e))
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', '6.0', ''))):
+                        lambda **kwargs: (('debian', '6.0', ''))):
             distro = ceph_detect_init.get()
             self.assertEqual(debian, distro)
             self.assertEqual('debian', distro.name)
@@ -203,27 +203,27 @@ class TestCephDetectInit(testtools.TestCase):
 
     def test_platform_information(self):
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', '6.0', ''))):
+                        lambda **kwargs: (('debian', '6.0', ''))):
             self.assertEqual(('debian', '6.0', 'squeeze'),
                              ceph_detect_init.platform_information())
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', '7.0', ''))):
+                        lambda **kwargs: (('debian', '7.0', ''))):
             self.assertEqual(('debian', '7.0', 'wheezy'),
                              ceph_detect_init.platform_information())
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', '8.0', ''))):
+                        lambda **kwargs: (('debian', '8.0', ''))):
             self.assertEqual(('debian', '8.0', 'jessie'),
                              ceph_detect_init.platform_information())
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', 'jessie/sid', ''))):
+                        lambda **kwargs: (('debian', 'jessie/sid', ''))):
             self.assertEqual(('debian', 'jessie/sid', 'sid'),
                              ceph_detect_init.platform_information())
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('debian', 'sid/jessie', ''))):
+                        lambda **kwargs: (('debian', 'sid/jessie', ''))):
             self.assertEqual(('debian', 'sid/jessie', 'sid'),
                              ceph_detect_init.platform_information())
 
@@ -232,7 +232,7 @@ class TestCephDetectInit(testtools.TestCase):
         self.assertEqual(0, main.run(argv))
 
         with mock.patch('platform.linux_distribution',
-                        lambda: (('unknown', '', ''))):
+                        lambda **kwargs: (('unknown', '', ''))):
             self.assertRaises(exc.UnsupportedPlatform, main.run, argv)
             self.assertEqual(0, main.run(argv + ['--default=sysvinit']))