From 27366b3e35008d0ffef6986555693b1874586795 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Jul 23 2019 13:08:11 +0000 Subject: Add epel*-playground into rpmdefines Signed-off-by: Stephen Smoogen Merges: https://pagure.io/fedpkg/pull-request/343 --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index f66cb12..fd050e6 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -141,6 +141,13 @@ class Commands(pyrpkg.Commands): self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch) self.override = 'epel%s-override' % self._distval self._distunset = 'fedora' + elif re.match(r'epel\d+-playground$', self.branch_merge): + self._distval = re.search(r'\d+', self.branch_merge).group(0) + self._distvar = 'rhel' + self._disttag = 'el%s_playground' % self._distval + self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch) + self.override = 'epel%s-override' % self._distval + self._distunset = 'fedora' elif re.match(r'olpc\d$', self.branch_merge): self._distval = self.branch_merge.split('olpc')[1] self._distvar = 'olpc' diff --git a/test/test_commands.py b/test/test_commands.py index 7824f9f..ebf4a3f 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -246,6 +246,21 @@ class TestLoadRpmDefines(CommandTestCase): self.assert_rpmdefines() @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock) + def test_load_epel8_playground_dist_tag(self, branch_merge): + branch_merge.return_value = 'epel8-playground' + + self.cmd.load_rpmdefines() + + self.assertEqual('8', self.cmd._distval) + self.assertEqual('rhel', self.cmd._distvar) + self.assertEqual('el8_playground', self.cmd._disttag) + self.assertEqual('epel-8-i686', self.cmd.mockconfig) + self.assertEqual('epel8-override', self.cmd.override) + self.assertTrue(hasattr(self.cmd, '_distunset')) + + self.assert_rpmdefines() + + @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock) @patch('fedpkg.Commands._findmasterbranch') def test_load_master_dist_tag(self, _findmasterbranch, branch_merge): _findmasterbranch.return_value = '28'