Merge "Add RHEL support"

This commit is contained in:
Jenkins 2017-01-11 18:47:02 +00:00 committed by Gerrit Code Review
commit 2474c17d16
2 changed files with 23 additions and 1 deletions

View File

@ -194,7 +194,11 @@ class Depends(object):
if distro in ["debian", "ubuntu"]:
atoms.add("dpkg")
self.platform = Dpkg()
elif distro in ["centos", "fedora", "opensuse", "suselinux"]:
elif distro in ["centos", "redhatenterpriseserver", "fedora",
"opensuse", "suselinux"]:
if distro == "redhatenterpriseserver":
# just short alias
atoms.add("rhel")
atoms.add("rpm")
self.platform = Rpm()
elif distro in ["gentoo"]:

View File

@ -68,6 +68,17 @@ class TestDepends(TestCase):
self.assertThat(
depends.platform_profiles(), Contains("platform:centos"))
def test_detects_rhel(self):
with self._mock_lsb("RedHatEnterpriseServer"):
depends = Depends("")
platform_profiles = depends.platform_profiles()
self.assertThat(
platform_profiles,
Contains("platform:redhatenterpriseserver"))
self.assertThat(
platform_profiles,
Contains("platform:rhel"))
def test_detects_fedora(self):
with self._mock_lsb("Fedora"):
depends = Depends("")
@ -118,6 +129,13 @@ class TestDepends(TestCase):
depends.platform_profiles(), Contains("platform:rpm"))
self.assertIsInstance(depends.platform, Rpm)
def test_rhel_implies_rpm(self):
with self._mock_lsb("RedHatEnterpriseServer"):
depends = Depends("")
self.assertThat(
depends.platform_profiles(), Contains("platform:rpm"))
self.assertIsInstance(depends.platform, Rpm)
def test_fedora_implies_rpm(self):
with self._mock_lsb("Fedora"):
depends = Depends("")