From 4ea95f832d05ec713726b47609854a5bdc574081 Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Tue, 3 Jan 2017 14:15:05 +0200 Subject: [PATCH] Add RHEL support Change-Id: I5dd1ade31f4840b834f557e2a1f8615d477490e3 Related-Bug: 1653654 Story: 2000835 --- bindep/depends.py | 6 +++++- bindep/tests/test_depends.py | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/bindep/depends.py b/bindep/depends.py index 210626d..931d4a1 100644 --- a/bindep/depends.py +++ b/bindep/depends.py @@ -199,7 +199,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"]: diff --git a/bindep/tests/test_depends.py b/bindep/tests/test_depends.py index bf21e73..44185c5 100644 --- a/bindep/tests/test_depends.py +++ b/bindep/tests/test_depends.py @@ -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("")