Merge #1118 Removing tests for _check_upload as long as function was separated from pull-request

This commit is contained in:
Matt Prahl
2019-01-11 13:52:37 +00:00

View File

@@ -873,20 +873,9 @@ class TestBuild:
assert "%s:%s" % (mmd.get_name(), mmd.get_stream()) in requires
@patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession")
@patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._check_upload",
return_value='mbs/123456789-1234')
def test_upload_outputs(self, upload_checker, cl_session):
''' Tests whether _upload_outputs function return already existing directory
if there's one '''
rv = self.cg._upload_outputs(cl_session.return_value, dict(), '')
assert rv == upload_checker.return_value
@patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession")
@patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._check_upload",
return_value='mbs/123456789-1234')
@patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._tag_cg_build")
@patch("module_build_service.builder.KojiContentGenerator.KojiContentGenerator._load_koji_tag")
def test_koji_cg_koji_import(self, tag_loader, tagger, upload_checker, cl_session):
def test_koji_cg_koji_import(self, tag_loader, tagger, cl_session):
''' Tests whether build is still tagged even if there's an exception in CGImport '''
cl_session.return_value.CGImport = Mock(
side_effect=koji.GenericError('Build already exists asdv'))