PR#108: Support two digit EPEL releases - fedora-qa/oraculum

František Zatloukal • 4 years ago

a74bd15

oraculum/utils/dashboard_helpers.py

file modified

+8 -5

		`@@ -182,18 +182,21 @@`
		`"""`
		`releases = CACHE.get("fedora_releases")`
		`dist = dist.replace("~bootstrap", "")`
		`- if "el" in dist or "epel" in dist.lower():`
		`- return "EPEL %s" % dist[-1:]`
		`+ dist = dist.lower()`
		`+ if "el" in dist or "epel" in dist:`
		`+ dist = dist.replace("epel", "").replace("el", "")`
		`+ return "EPEL %s" % dist`

		`# Let's check if it's Fedora branch at all`
		`re_rule = re.compile(r'^f.\d+$')`

		`- if not re_rule.match(dist.lower()):`
		`+ if not re_rule.match(dist):`
		`return "Fedora Unknown"`

		`- if int(dist[-2:]) == releases["rawhide"]:`
		`+ dist = dist.replace("fc", "").replace("f", "")`
		`+ if int(dist) == releases["rawhide"]:`
		`return "Fedora Rawhide"`
		`- return "Fedora %s" % dist[-2:]`
		`+ return "Fedora %s" % dist`


		`def release_is_active(release_string):`

tests/test_packager_dashboard_helpers.py

file modified

+4 -2

		`@@ -15,19 +15,21 @@`
		`"stable": 97,`
		`"branched": 98,`
		`"rawhide": 99,`
		`- "values": [96, 97, 98, 99]`
		`+ "values": [96, 97, 98, 99, 999]`
		`}`

		`def test_release_is_active(self, monkeypatch):`

		`# Force EPEL Releases for tests`
		`# This is usually defined in settings.py by real values, so we can't put it in config.py TEST block`
		`- app.config["EPEL_RELEASES"] = [1, 2]`
		`+ app.config["EPEL_RELEASES"] = [1, 2, 99]`
		`monkeypatch.setattr(CACHE, 'get', mock.MagicMock(return_value=self.stub_fedora_releases))`

		`assert dashboard_helpers.release_is_active("Fedora Rawhide")`
		`assert dashboard_helpers.release_is_active("Fedora 97")`
		`+ assert dashboard_helpers.release_is_active("Fedora 999")`
		`assert dashboard_helpers.release_is_active("EPEL 1")`
		`+ assert dashboard_helpers.release_is_active("EPEL 99")`
		`assert not dashboard_helpers.release_is_active("Fedora 91")`
		`assert not dashboard_helpers.release_is_active("EPEL 3")`