From dcd38db5e02e587c9ee3d078ca23add5d39ed5bb Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Mon, 4 Feb 2019 15:18:33 -0800 Subject: [PATCH] hide the missing krbV module --- tests/test_builder/test_koji.py | 7 +++++++ tests/test_content_generator.py | 5 +++++ tests/test_scheduler/test_poller.py | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py index 78b5ff2d..321cc291 100644 --- a/tests/test_builder/test_koji.py +++ b/tests/test_builder/test_koji.py @@ -324,6 +324,7 @@ class TestKojiBuilder: expected_calls = [mock.call(1, 'foo'), mock.call(2, 'foo'), mock.call(1, 'bar')] assert mock_session.untagBuild.mock_calls == expected_calls + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights(self, ClientSession): session = ClientSession.return_value @@ -347,6 +348,7 @@ class TestKojiBuilder: # getLoggedInUser requires to a logged-in session session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights_no_task_id(self, ClientSession): session = ClientSession.return_value @@ -368,6 +370,7 @@ class TestKojiBuilder: assert session.getTaskDescendents.mock_calls == expected_calls session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights_no_build(self, ClientSession): session = ClientSession.return_value @@ -389,6 +392,7 @@ class TestKojiBuilder: assert session.getTaskDescendents.mock_calls == expected_calls session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights_listBuilds_failed(self, ClientSession): session = ClientSession.return_value @@ -406,6 +410,7 @@ class TestKojiBuilder: assert session.listBuilds.mock_calls == expected_calls session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights_getPackageID_failed(self, ClientSession): session = ClientSession.return_value @@ -421,6 +426,7 @@ class TestKojiBuilder: session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_get_build_weights_getLoggedInUser_failed(self, ClientSession): session = ClientSession.return_value @@ -686,6 +692,7 @@ class TestKojiBuilder: assert ClientSession.return_value == session assert ClientSession.return_value.krb_login.assert_not_called + @patch.dict('sys.modules', krbV=MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_ensure_builder_use_a_logged_in_koji_session(self, ClientSession): builder = KojiModuleBuilder('owner', MagicMock(), conf, 'module-tag', []) diff --git a/tests/test_content_generator.py b/tests/test_content_generator.py index 42b8b62d..03816581 100644 --- a/tests/test_content_generator.py +++ b/tests/test_content_generator.py @@ -208,6 +208,7 @@ class TestBuild: with open(path.join(dir_path, "modulemd.i686.txt")) as mmd: assert len(mmd.read()) == 255 + @patch.dict("sys.modules", krbV=Mock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_tag_cg_build(self, ClientSession): """ Test that the CG build is tagged. """ @@ -223,6 +224,7 @@ class TestBuild: # tagBuild requires logging into a session in advance. koji_session.krb_login.assert_called_once() + @patch.dict("sys.modules", krbV=Mock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_tag_cg_build_fallback_to_default_tag(self, ClientSession): """ Test that the CG build is tagged to default tag. """ @@ -240,6 +242,7 @@ class TestBuild: # tagBuild requires logging into a session in advance. koji_session.krb_login.assert_called_once() + @patch.dict("sys.modules", krbV=Mock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_tag_cg_build_no_tag_set(self, ClientSession): """ Test that the CG build is not tagged when no tag set. """ @@ -254,6 +257,7 @@ class TestBuild: # tagBuild requires logging into a session in advance. koji_session.krb_login.assert_called_once() + @patch.dict("sys.modules", krbV=Mock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_tag_cg_build_no_tag_available(self, ClientSession): """ Test that the CG build is not tagged when no tag available. """ @@ -872,6 +876,7 @@ class TestBuild: requires.append("%s:%s" % (name, stream)) assert "%s:%s" % (mmd.get_name(), mmd.get_stream()) in requires + @patch.dict("sys.modules", krbV=Mock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") @patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._tag_cg_build") @patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._load_koji_tag") diff --git a/tests/test_scheduler/test_poller.py b/tests/test_scheduler/test_poller.py index e4031b34..4198b7e4 100644 --- a/tests/test_scheduler/test_poller.py +++ b/tests/test_scheduler/test_poller.py @@ -99,6 +99,7 @@ class TestPoller: assert len(start_build_component.mock_calls) == expected_build_calls + @patch.dict("sys.modules", krbV=mock.MagicMock()) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_trigger_new_repo_when_failed( self, ClientSession, create_builder, global_consumer, dbg): @@ -132,6 +133,7 @@ class TestPoller: koji_session.newRepo.assert_called_once_with( "module-testmodule-master-20170219191323-c40c156c-build") + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_trigger_new_repo_when_succeeded( self, ClientSession, create_builder, global_consumer, dbg): @@ -204,6 +206,7 @@ class TestPoller: for component in components: assert component.state is None + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_old_build_targets_are_not_associated_with_any_module_builds( self, ClientSession, create_builder, global_consumer, dbg): @@ -224,6 +227,7 @@ class TestPoller: koji_session.deleteBuildTarget.assert_not_called() + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_dont_delete_base_module_build_target( self, ClientSession, create_builder, global_consumer, dbg): @@ -249,6 +253,7 @@ class TestPoller: koji_session.deleteBuildTarget.assert_not_called() + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_dont_delete_build_target_for_unfinished_module_builds( self, ClientSession, create_builder, global_consumer, dbg): @@ -276,6 +281,7 @@ class TestPoller: koji_session.deleteBuildTarget.assert_not_called() + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_only_delete_build_target_with_allowed_koji_tag_prefix( self, ClientSession, create_builder, global_consumer, dbg): @@ -321,6 +327,7 @@ class TestPoller: koji_session.deleteBuildTarget.assert_called_once_with(1) koji_session.krb_login.assert_called_once() + @patch.dict('sys.modules', krbV=mock.MagicMock()) @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession') def test_cant_delete_build_target_if_not_reach_delete_time( self, ClientSession, create_builder, global_consumer, dbg):