Remove RHEL from downburst version list

... and associated unit test

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 081a6bd48461e43a1881ddc74c6ec2e98a47a2c4..81abc64cac64e51933703c6cb58c9ab6fbee4c93 100644 (file)
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -37,7 +37,6 @@ def get_distro_from_downburst():
                      u'fedora': [u'17', u'18', u'19', u'20', u'22'],
                      u'centos': [u'6.3', u'6.4', u'6.5', u'7.0'],
                      u'opensuse': [u'12.2'],
-                     u'rhel': [u'6.3', u'6.4', u'6.5', u'7.0', u'7beta'],
                      u'centos_minimal': [u'6.4', u'6.5'],
                      u'ubuntu': [u'8.04(hardy)', u'9.10(karmic)',
                                  u'10.04(lucid)', u'10.10(maverick)',

diff --git a/teuthology/test/test_vps_os_vers_parameter_checking.py b/teuthology/test/test_vps_os_vers_parameter_checking.py
index d3b5fe9cbe26215c06afe171fa32acab4a36471b..b7ba80df5b15f195132448c5c669a8baf605a0fd 100644 (file)
--- a/teuthology/test/test_vps_os_vers_parameter_checking.py
+++ b/teuthology/test/test_vps_os_vers_parameter_checking.py
@@ -17,7 +17,7 @@ class TestVpsOsVersionParamCheck(object):
                       self.fake_ctx.machine_type,
                       self.fake_ctx.os_type,
                       self.fake_ctx.os_version)
-                            
+
         assert check_value
 
     def test_ubuntu_number(self):
@@ -29,15 +29,6 @@ class TestVpsOsVersionParamCheck(object):
                       self.fake_ctx.os_version)
         assert check_value
 
-    def test_rhel(self):
-        self.fake_ctx.os_type = 'rhel'
-        self.fake_ctx.os_version = '6.5'
-        check_value = lock.vps_version_or_type_valid(
-                      self.fake_ctx.machine_type,
-                      self.fake_ctx.os_type,
-                      self.fake_ctx.os_version)
-        assert check_value
-
     def test_mixup(self):
         self.fake_ctx.os_type = '6.5'
         self.fake_ctx.os_version = 'rhel'