From 8a496af3822f7a5ce58752f456d83bfef02c3e0a Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jan 28 2018 14:08:31 +0000 Subject: Patch krbContext by default in tests. --- diff --git a/tests/helpers.py b/tests/helpers.py index a0f3f38..96fee4a 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -45,6 +45,16 @@ BUILD_STATES = { class FreshmakerTestCase(unittest.TestCase): + + def setUp(self): + # We don't have any valid Kerberos context during the tests, so disable + # it by default by patching it. + self.krb_context_patcher = patch('freshmaker.utils.krbContext') + self.krb_context_patcher.start() + + def tearDown(self): + self.krb_context_patcher.stop() + def get_event_from_msg(self, message): event = events.BaseEvent.from_fedmsg(message['body']['topic'], message['body']) return event diff --git a/tests/test_auth.py b/tests/test_auth.py index 66454ea..4fade09 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -213,7 +213,7 @@ class TestInitAuth(FreshmakerTestCase): """Test init_auth""" def setUp(self): - super(FreshmakerTestCase, self).setUp() + super(TestInitAuth, self).setUp() self.login_manager = Mock() diff --git a/tests/test_errata_advisory_rpms_signed_handler.py b/tests/test_errata_advisory_rpms_signed_handler.py index 972f0b2..6798298 100644 --- a/tests/test_errata_advisory_rpms_signed_handler.py +++ b/tests/test_errata_advisory_rpms_signed_handler.py @@ -476,7 +476,6 @@ class TestRequestBootISOCompose(helpers.FreshmakerTestCase): }) self.handler = ErrataAdvisoryRPMsSignedHandler() - @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.krb_context') @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.' 'create_odcs_client') @patch('freshmaker.handlers.errata.ErrataAdvisoryRPMsSignedHandler.' @@ -485,7 +484,7 @@ class TestRequestBootISOCompose(helpers.FreshmakerTestCase): '_get_base_image_build_tag') def test_get_boot_iso_compose( self, get_base_image_build_tag, get_base_image_build_target, - create_odcs_client, krb_context): + create_odcs_client): odcs = create_odcs_client.return_value odcs.new_compose.return_value = {'id': 1} diff --git a/tests/test_errata_advisory_state_changed.py b/tests/test_errata_advisory_state_changed.py index 0b7a55c..45a5329 100644 --- a/tests/test_errata_advisory_state_changed.py +++ b/tests/test_errata_advisory_state_changed.py @@ -247,8 +247,7 @@ class TestBatches(helpers.ModelsTestCase): }) @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.create_odcs_client') - @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.krb_context') - def test_batches_records(self, krb_context, create_odcs_client): + def test_batches_records(self, create_odcs_client): """ Tests that batches are properly recorded in DB. """ @@ -472,9 +471,8 @@ class TestPrepareYumRepo(helpers.ModelsTestCase): 'ErrataAdvisoryRPMsSignedHandler._get_compose_source') @patch('time.sleep') @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.Errata') - @patch('freshmaker.utils.krbContext') def test_get_repo_url_when_succeed_to_generate_compose( - self, krb_context, errata, sleep, _get_compose_source, + self, errata, sleep, _get_compose_source, _get_packages_for_compose, create_odcs_client): odcs = create_odcs_client.return_value _get_packages_for_compose.return_value = ['httpd', 'httpd-debuginfo'] @@ -518,10 +516,8 @@ class TestPrepareYumRepo(helpers.ModelsTestCase): 'ErrataAdvisoryRPMsSignedHandler._get_compose_source') @patch('time.sleep') @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.Errata') - @patch('freshmaker.utils.krb_context', - new_callable=PropertyMock) def test_get_repo_url_packages_in_multiple_tags( - self, krb_context, errata, sleep, _get_compose_source, + self, errata, sleep, _get_compose_source, _get_packages_for_compose, create_odcs_client): _get_packages_for_compose.return_value = ['httpd', 'httpd-debuginfo'] _get_compose_source.side_effect = [ @@ -550,10 +546,8 @@ class TestPrepareYumRepo(helpers.ModelsTestCase): 'ErrataAdvisoryRPMsSignedHandler._get_compose_source') @patch('time.sleep') @patch('freshmaker.handlers.errata.errata_advisory_rpms_signed.Errata') - @patch('freshmaker.utils.krb_context', - new_callable=PropertyMock) def test_get_repo_url_packages_not_found_in_tag( - self, krb_context, errata, sleep, _get_compose_source, + self, errata, sleep, _get_compose_source, _get_packages_for_compose, create_odcs_client): _get_packages_for_compose.return_value = ['httpd', 'httpd-debuginfo'] _get_compose_source.return_value = None diff --git a/tests/test_git_dockerfile_change_handler.py b/tests/test_git_dockerfile_change_handler.py index 1655ddf..d0e77d3 100644 --- a/tests/test_git_dockerfile_change_handler.py +++ b/tests/test_git_dockerfile_change_handler.py @@ -52,7 +52,6 @@ class GitDockerfileChangeHandlerTest(BaseTestCase): @patch('koji.read_config') @patch('koji.ClientSession') - @patch('freshmaker.utils.krbContext') @patch("freshmaker.config.Config.krb_auth_principal", new_callable=PropertyMock, return_value="user@example.com") @patch.object(freshmaker.conf, 'handler_build_whitelist', new={ @@ -61,7 +60,7 @@ class GitDockerfileChangeHandlerTest(BaseTestCase): } }) def test_rebuild_if_dockerfile_changed( - self, auth_principal, krbContext, ClientSession, read_config): + self, auth_principal, ClientSession, read_config): read_config.return_value = { 'server': 'https://localhost/kojihub', 'krb_rdns': False, @@ -73,10 +72,6 @@ class GitDockerfileChangeHandlerTest(BaseTestCase): msg = get_fedmsg('git_receive_dockerfile_changed') self.consume_fedmsg(msg) - # Kerberos context should be prepare for logging into koji by calling - # krb_login. - krbContext.assert_called_once() - mock_session.krb_login.assert_called_once_with() mock_session.buildContainer.assert_called_once_with( 'git://pkgs.fedoraproject.org/container/testimage.git?#e1f39d43471fc37ec82616f76a119da4eddec787',