From eefde6d3ad019b91caa2c2859a88fbcfce5e9afc Mon Sep 17 00:00:00 2001 From: Giulia Naponiello Date: Mar 09 2020 10:56:27 +0000 Subject: Merge #492 `Mock koji.read_config properly in tests` --- diff --git a/tests/handlers/internal/test_freshmaker_manage_request.py b/tests/handlers/internal/test_freshmaker_manage_request.py index d8f8f85..3be1943 100644 --- a/tests/handlers/internal/test_freshmaker_manage_request.py +++ b/tests/handlers/internal/test_freshmaker_manage_request.py @@ -66,6 +66,10 @@ class CancelEventOnFreshmakerManageRequestTest(helpers.ModelsTestCase): super(CancelEventOnFreshmakerManageRequestTest, self).setUp() events.BaseEvent.register_parser(FreshmakerManageRequestParser) + self.koji_read_config_patcher = patch( + 'koji.read_config', return_value={'server': 'http://localhost/'}) + self.koji_read_config_patcher.start() + self.db_event = models.Event.create( db.session, "2017-00000000-0000-0000-0000-000000000003", "RHSA-2018-103", events.TestingEvent) @@ -76,6 +80,9 @@ class CancelEventOnFreshmakerManageRequestTest(helpers.ModelsTestCase): db.session, self.db_event, "bash", "module", build_id=1238, state=ArtifactBuildState.CANCELED.value) + def tearDown(self): + self.koji_read_config_patcher.stop() + @patch('freshmaker.kojiservice.KojiService.cancel_build') def test_cancel_event_on_freshmaker_manage_request(self, mocked_cancel_build): msg = get_fedmsg('freshmaker_manage_eventcancel') diff --git a/tests/test_lightblue.py b/tests/test_lightblue.py index 1a26fb6..22f094e 100644 --- a/tests/test_lightblue.py +++ b/tests/test_lightblue.py @@ -281,6 +281,10 @@ class TestContainerImageObject(helpers.FreshmakerTestCase): def setUp(self): super(TestContainerImageObject, self).setUp() + self.koji_read_config_patcher = patch( + 'koji.read_config', return_value={'server': 'http://localhost/'}) + self.koji_read_config_patcher.start() + self.patcher = helpers.Patcher( 'freshmaker.lightblue.') self.get_distgit_files = self.patcher.patch("get_distgit_files") @@ -313,6 +317,7 @@ class TestContainerImageObject(helpers.FreshmakerTestCase): def tearDown(self): super(TestContainerImageObject, self).tearDown() self.patcher.unpatch_all() + self.koji_read_config_patcher.stop() def test_create(self): image = ContainerImage.create({ @@ -603,6 +608,10 @@ class TestQueryEntityFromLightBlue(helpers.FreshmakerTestCase): # Clear the ContainerImage Koji cache. ContainerImage.KOJI_BUILDS_CACHE = {} + self.koji_read_config_patcher = patch( + 'koji.read_config', return_value={'server': 'http://locahost/'}) + self.koji_read_config_patcher.start() + self.patcher = helpers.Patcher( 'freshmaker.lightblue.') self.get_distgit_files = self.patcher.patch("get_distgit_files") @@ -844,6 +853,7 @@ class TestQueryEntityFromLightBlue(helpers.FreshmakerTestCase): def tearDown(self): super(TestQueryEntityFromLightBlue, self).tearDown() self.patcher.unpatch_all() + self.koji_read_config_patcher.stop() @patch('freshmaker.lightblue.requests.post') def test_find_container_images(self, post): diff --git a/tests/test_producer.py b/tests/test_producer.py index 6e38185..7d98bc0 100644 --- a/tests/test_producer.py +++ b/tests/test_producer.py @@ -39,6 +39,11 @@ class TestCheckUnfinishedKojiTasks(helpers.ModelsTestCase): def setUp(self): super(TestCheckUnfinishedKojiTasks, self).setUp() + + self.koji_read_config_patcher = patch( + 'koji.read_config', return_value={'server': 'http://localhost/'}) + self.koji_read_config_patcher.start() + db_event = Event.get_or_create( db.session, "msg1", "current_event", ErrataAdvisoryRPMsSignedEvent) db_event.state = EventState.BUILDING @@ -48,6 +53,9 @@ class TestCheckUnfinishedKojiTasks(helpers.ModelsTestCase): self.build.build_id = 10 db.session.commit() + def tearDown(self): + self.koji_read_config_patcher.stop() + @patch('freshmaker.kojiservice.KojiService.get_task_info') @patch("freshmaker.consumer.get_global_consumer") def test_koji_task_failed(self, global_consumer, get_task_info):