opendev
/
bindep
Code Issues Proposed changes

Merge "bindep: depends: Add support for openSUSE {Leap,Tumbleweed}"

This commit is contained in:
Jenkins 2017-04-11 05:40:14 +00:00 committed by Gerrit Code Review
parent 428ae68863 0f1dc05165
commit 5061e10fa1
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindep/depends.py
View File

@ -243,10 +243,14 @@ class Depends(object):
atoms.add("dpkg")
self.platform = Dpkg()
elif distro in ["centos", "redhatenterpriseserver", "fedora",
"opensuse", "suselinux"]:
"opensuseproject", "opensusetumbleweed",
"suselinux"]:
if distro == "redhatenterpriseserver":
# just short alias
atoms.add("rhel")
elif distro in ["opensuseproject", "opensusetumbleweed"]:
# just short alias
atoms.add("opensuse")
atoms.add("rpm")
self.platform = Rpm()
elif distro in ["gentoo"]:

31
bindep/tests/test_depends.py
View File

@ -85,11 +85,23 @@ class TestDepends(TestCase):
self.assertThat(
depends.platform_profiles(), Contains("platform:fedora"))
def test_detects_opensuse(self):
with self._mock_lsb("openSUSE"):
def test_detects_opensuse_project(self):
with self._mock_lsb("openSUSE Project"):
depends = Depends("")
self.assertThat(
depends.platform_profiles(), Contains("platform:opensuse"))
platform_profiles = depends.platform_profiles()
self.assertThat(platform_profiles,
Contains("platform:opensuseproject"))
self.assertThat(platform_profiles,
Contains("platform:opensuse"))
def test_detects_opensuse_tumbleweed(self):
with self._mock_lsb("openSUSE Tumbleweed"):
depends = Depends("")
platform_profiles = depends.platform_profiles()
self.assertThat(platform_profiles,
Contains("platform:opensusetumbleweed"))
self.assertThat(platform_profiles,
Contains("platform:opensuse"))
def test_detects_suse_linux(self):
with self._mock_lsb("SUSE Linux"):
@ -143,8 +155,15 @@ class TestDepends(TestCase):
depends.platform_profiles(), Contains("platform:rpm"))
self.assertIsInstance(depends.platform, Rpm)
def test_opensuse_implies_rpm(self):
with self._mock_lsb("openSUSE"):
def test_opensuse_project_implies_rpm(self):
with self._mock_lsb("openSUSE Project"):
depends = Depends("")
self.assertThat(
depends.platform_profiles(), Contains("platform:rpm"))
self.assertIsInstance(depends.platform, Rpm)
def test_opensuse_tumbleweed_implies_rpm(self):
with self._mock_lsb("openSUSE Tumbleweed"):
depends = Depends("")
self.assertThat(
depends.platform_profiles(), Contains("platform:rpm"))