diff --git a/bindep/depends.py b/bindep/depends.py index 9d1668c..8d568c0 100644 --- a/bindep/depends.py +++ b/bindep/depends.py @@ -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"]: diff --git a/bindep/tests/test_depends.py b/bindep/tests/test_depends.py index e768a1a..4e10580 100644 --- a/bindep/tests/test_depends.py +++ b/bindep/tests/test_depends.py @@ -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"))