From 9a4a912c359d5a27de26fb998ae3d98ab37a4ce7 Mon Sep 17 00:00:00 2001 From: Ondrej Nosek Date: May 04 2020 00:53:58 +0000 Subject: Allow retirement on epel branches - tests Signed-off-by: Ondrej Nosek --- diff --git a/test/test_cli.py b/test/test_cli.py index c25f6bb..c22eefd 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -2329,7 +2329,7 @@ class TestRetire(CliTestCase): """ @patch('requests.get') - def retire_release(self, release_state, mock_get): + def retire_release(self, branch, release_state, mock_get): mock_rv = Mock() if release_state: mock_rv.ok = True @@ -2340,7 +2340,7 @@ class TestRetire(CliTestCase): mock_rv.status_code = 404 mock_get.return_value = mock_rv - with patch('sys.argv', ['fedpkg', '--release', 'f30', 'retire', 'retire_message']): + with patch('sys.argv', ['fedpkg', '--release', branch, 'retire', 'retire_message']): cli = self.new_cli(cfg='fedpkg-test.conf') # retire method in rpkg would be called, but there is not environment configured # therefore just Exception is catched @@ -2349,7 +2349,7 @@ class TestRetire(CliTestCase): cli.retire() @patch('requests.get') - def do_not_retire_release(self, release_state, mock_get): + def do_not_retire_release(self, branch, release_state, mock_get): mock_rv = Mock() mock_rv.ok = True mock_rv.json.return_value = { @@ -2357,17 +2357,26 @@ class TestRetire(CliTestCase): } mock_get.return_value = mock_rv - with patch('sys.argv', ['fedpkg', '--release', 'f30', 'retire', 'retire_message']): + with patch('sys.argv', ['fedpkg', '--release', branch, 'retire', 'retire_message']): cli = self.new_cli(cfg='fedpkg-test.conf') # retire is terminated after check cli.args.path = '/repo_path' cli.retire() def test_retire_fedora_release(self): - self.do_not_retire_release("disabled") - self.retire_release("pending") - self.do_not_retire_release("frozen") - self.do_not_retire_release("current") - self.do_not_retire_release("archived") - # unknown fedora (or other) release - self.retire_release(None) + self.do_not_retire_release("f30", "disabled") + self.retire_release("f30", "pending") + self.do_not_retire_release("f30", "frozen") + self.do_not_retire_release("f30", "current") + self.do_not_retire_release("f30", "archived") + self.retire_release("unknown_fedora_release", None) + # epel release + self.retire_release("el6", "disabled") + self.retire_release("el6", "pending") + self.retire_release("el6", "frozen") + self.retire_release("el6", None) + self.retire_release("epel7", "current") + self.retire_release("epel7", "archived") + self.retire_release("epel7", "pending") + self.retire_release("epel7", None) + self.retire_release("epel8", None)