Add tests for rhel rpm dist detection

diff --git a/ceph_deploy/hosts/centos/__init__.py b/ceph_deploy/hosts/centos/__init__.py
index c03ed635bb3a1cfd538b6418fc23b53f472fad6b..10259ad48714da07d4d60d513973329b3a17ea51 100644 (file)
--- a/ceph_deploy/hosts/centos/__init__.py
+++ b/ceph_deploy/hosts/centos/__init__.py
@@ -1,6 +1,6 @@
 import mon  # noqa
 import pkg  # noqa
-from install import install, mirror_install, repo_install, repository_url_part  # noqa
+from install import install, mirror_install, repo_install, repository_url_part, rpm_dist  # noqa
 from uninstall import uninstall  # noqa
 
 # Allow to set some information about this distro

diff --git a/ceph_deploy/tests/unit/hosts/test_centos.py b/ceph_deploy/tests/unit/hosts/test_centos.py
index a7d93a625e58176393fac939b71507acfe5d566b..afb08f35e9361e52036c45fce155c7993bb61b6e 100644 (file)
--- a/ceph_deploy/tests/unit/hosts/test_centos.py
+++ b/ceph_deploy/tests/unit/hosts/test_centos.py
@@ -1,8 +1,7 @@
 from ceph_deploy.hosts import centos
 from mock import Mock
 
-
-class TestCentosUrlPart(object):
+class TestCentosVersionDetection(object):
 
     def setup(self):
         self.distro = Mock()
@@ -23,3 +22,18 @@ class TestCentosUrlPart(object):
         self.distro.normalized_name = 'redhat'
         self.distro.release = '7.0'
         assert centos.repository_url_part(self.distro) == 'rhel7'
+
+    def test_rpm_dist_fallsback_to_el6(self):
+        self.distro.normalized_name = 'redhat'
+        self.distro.release = '3'
+        assert centos.rpm_dist(self.distro) == 'el6'
+
+    def test_rpm_dist_detects_rhel6(self):
+        self.distro.normalized_name = 'redhat'
+        self.distro.release = '6.6'
+        assert centos.rpm_dist(self.distro) == 'el6'
+
+    def test_rpm_dist_detects_rhel7(self):
+        self.distro.normalized_name = 'redhat'
+        self.distro.release = '7.0'
+        assert centos.rpm_dist(self.distro) == 'el7'