opendev
/
bindep
Code Issues Proposed changes

SUSE: Update openSUSE Tumbleweed references for lsb-release-3.X.X 

lsb-release-3.X.X doesn't report 'openSUSE Tumbleweed' anymore but it
simply returns 'openSUSE' so update the references for Tumbleweed.

Change-Id: I3e99948167655a8a94c76a1a90d7ddefa6d5bb5b
Link: http://bugzilla.suse.com/show_bug.cgi?id=1059374
This commit is contained in:
Markos Chandras 2017-09-20 15:13:08 +01:00
parent aca47f5bd2
commit 52eb3db1ce
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindep/depends.py
View File

@ -307,13 +307,13 @@ class Depends(object):
self.platform = Dpkg() self.platform = Dpkg()
elif distro in ["amazonami", "centos", "redhatenterpriseserver", elif distro in ["amazonami", "centos", "redhatenterpriseserver",
"redhatenterpriseworkstation", "redhatenterpriseworkstation",
"fedora", "opensuseproject", "opensusetumbleweed", "fedora", "opensuseproject", "opensuse",
"suselinux"]: "suselinux"]:
if distro in ["redhatenterpriseserver", if distro in ["redhatenterpriseserver",
"redhatenterpriseworkstation"]: "redhatenterpriseworkstation"]:
# just short alias # just short alias
atoms.add("rhel") atoms.add("rhel")
elif distro in ["opensuseproject", "opensusetumbleweed"]: elif distro == "opensuseproject":
# just short alias # just short alias
atoms.add("opensuse") atoms.add("opensuse")
# Family aliases # Family aliases

10
bindep/tests/test_depends.py
View File

@ -142,12 +142,10 @@ class TestDepends(TestCase):
self.assertThat(platform_profiles, self.assertThat(platform_profiles,
Contains("platform:suse")) Contains("platform:suse"))
def test_detects_opensuse_tumbleweed(self): def test_detects_opensuse(self):
with self._mock_lsb("openSUSE Tumbleweed"): with self._mock_lsb("openSUSE"):
depends = Depends("") depends = Depends("")
platform_profiles = depends.platform_profiles() platform_profiles = depends.platform_profiles()
self.assertThat(platform_profiles,
Contains("platform:opensusetumbleweed"))
self.assertThat(platform_profiles, self.assertThat(platform_profiles,
Contains("platform:opensuse")) Contains("platform:opensuse"))
self.assertThat(platform_profiles, self.assertThat(platform_profiles,
@ -213,8 +211,8 @@ class TestDepends(TestCase):
depends.platform_profiles(), Contains("platform:rpm")) depends.platform_profiles(), Contains("platform:rpm"))
self.assertIsInstance(depends.platform, Rpm) self.assertIsInstance(depends.platform, Rpm)
def test_opensuse_tumbleweed_implies_rpm(self): def test_opensuse_implies_rpm(self):
with self._mock_lsb("openSUSE Tumbleweed"): with self._mock_lsb("openSUSE"):
depends = Depends("") depends = Depends("")
self.assertThat( self.assertThat(
depends.platform_profiles(), Contains("platform:rpm")) depends.platform_profiles(), Contains("platform:rpm"))