From 9cf7814c3f2508ed47e2abef36af192d19bcfae1 Mon Sep 17 00:00:00 2001 From: Ondřej Nosek Date: Nov 10 2020 22:12:19 +0000 Subject: Tests for "--release eln" Merges: https://pagure.io/fedpkg/pull-request/415 Signed-off-by: Ondřej Nosek --- diff --git a/test/test_commands.py b/test/test_commands.py index 5ee3a92..3e9be98 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -178,7 +178,7 @@ class TestLoadRpmDefines(CommandTestCase): self.determine_runtime_env.stop() super(TestLoadRpmDefines, self).tearDown() - def assert_rpmdefines(self): + def assert_rpmdefines(self, extra_rpmdefines=[]): """Assert Commands._rpmdefines after calling load_rpmdefines""" expected_rpmdefines = [ "--define '_sourcedir %s'" % self.cmd.path, @@ -192,6 +192,7 @@ class TestLoadRpmDefines(CommandTestCase): "--define '%s 1'" % self.cmd._disttag.replace(".", "_"), "--eval '%%undefine %s'" % self.cmd._runtime_disttag ] + expected_rpmdefines.extend(extra_rpmdefines) self.assertEqual(expected_rpmdefines, self.cmd._rpmdefines) @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock) @@ -292,6 +293,36 @@ class TestLoadRpmDefines(CommandTestCase): self.assert_rpmdefines() + @patch('pyrpkg.Commands.kojisession', new_callable=PropertyMock) + @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock) + def test_load_eln_dist_tag(self, branch_merge, kojisession): + branch_merge.return_value = 'eln' + + self.cmd._kojisession = Mock() + koji_session = kojisession.return_value + koji_session.getBuildConfig.return_value = { + # minimal subset of the real koji response + 'extra': { + 'rpm.macro.eln': '104', + 'rpm.macro.rhel': '9', + }, + } + + self.cmd.load_rpmdefines() + + self.assertEqual('104', self.cmd._distval) + self.assertEqual('eln', self.cmd._distvar) + self.assertEqual('eln104', self.cmd._disttag) + self.assertEqual('fedora-eln-i686', self.cmd._mockconfig) + self.assertEqual('eln-override', self.cmd.override) + self.assertEqual('fedora', self.cmd._distunset) + + extra_rpmdefines = [ + "--define 'el9 1'", + "--define 'rhel 9'", + ] + self.assert_rpmdefines(extra_rpmdefines) + class TestFindMasterBranch(CommandTestCase): """Test Commands._findmasterbranch"""