From 72bcedac33f3ac9216917468a9efac0ee99a6f40 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Oct 17 2017 15:52:53 +0000 Subject: Clean rest cert related code Signed-off-by: Chenxiong Qi --- diff --git a/test/test_commands.py b/test/test_commands.py index 3c3529b..d3bb8c4 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -158,19 +158,12 @@ class TestLookaside(CommandTestCase): super(TestLookaside, self).setUp() self.cmd = self.make_commands() - @patch('fedpkg.Commands.cert_file', new_callable=PropertyMock) - @patch('fedpkg.Commands.ca_cert', new_callable=PropertyMock) - def test_get_lookaside(self, ca_cert, cert_file): - ca_cert.return_value = None - cert_file.return_value = None - + def test_get_lookaside(self): lookaside = self.cmd.lookasidecache self.assertEqual(self.cmd.lookasidehash, lookaside.hashtype) self.assertEqual(self.cmd.lookaside, lookaside.download_url) self.assertEqual(self.cmd.lookaside_cgi, lookaside.upload_url) - self.assertEqual(None, lookaside.client_cert) - self.assertEqual(None, lookaside.ca_cert) class TestLoadRpmDefines(CommandTestCase): diff --git a/test/test_retire.py b/test/test_retire.py index 3006846..6edfec7 100644 --- a/test/test_retire.py +++ b/test/test_retire.py @@ -81,13 +81,10 @@ class RetireTestCase(unittest.TestCase): self.assertRetired('my reason') self.assertEqual(len(client.cmd.push.call_args_list), 1) - @mock.patch('fedora_cert.read_user_cert') - def test_retire_without_namespace(self, read_user_cert): + def test_retire_without_namespace(self): self._setup_repo('ssh://git@pkgs.example.com/fedpkg') args = ['fedpkg', '--dist=master', 'retire', 'my reason'] - read_user_cert.return_value = 'packager' - client = self._fake_client(args) client.retire()