robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Modulemd import to pungi/__init__.py to remove duplicated code.

Browse source 
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
Jan Kaluza 2018-03-16 07:15:01 +01:00
parent 3f71cdd384
commit 1574f306c7
9 changed files with 38 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/test_createrepophase.py
View file

@ -18,15 +18,7 @@ from pungi.phases.createrepo import (CreaterepoPhase,
create_variant_repo,
get_productids_from_scm)
from tests.helpers import DummyCompose, PungiTestCase, copy_fixture, touch
try:
import gi # noqa
gi.require_version('Modulemd', '1.0') # noqa
from gi.repository import Modulemd # noqa
import pdc_client # noqa
HAS_MODULE_SUPPORT = True
except ImportError:
HAS_MODULE_SUPPORT = False
from pungi import Modulemd
class TestCreaterepoPhase(PungiTestCase):
@ -716,13 +708,11 @@ class TestCreateVariantRepo(PungiTestCase):
with open(list_file) as f:
self.assertEqual(f.read(), 'Packages/b/bash-4.3.30-2.fc21.src.rpm\n')
@unittest.skipUnless(Modulemd is not None, 'Skipped test, no module support.')
@mock.patch('pungi.phases.createrepo.run')
@mock.patch('pungi.phases.createrepo.CreaterepoWrapper')
def test_variant_repo_modules_artifacts_not_in_compose(
self, CreaterepoWrapperCls, run):
if not HAS_MODULE_SUPPORT:
self.skipTest("Skipped test, no module support.")
compose = DummyCompose(self.topdir, {
'createrepo_checksum': 'sha256',
})
@ -759,13 +749,11 @@ class TestCreateVariantRepo(PungiTestCase):
repo.get_modifyrepo_cmd.mock_calls,
[mock.call(repodata_dir, ANY, compress_type='gz', mdtype='modules')])
@unittest.skipUnless(Modulemd is not None, 'Skipped test, no module support.')
@mock.patch('pungi.phases.createrepo.run')
@mock.patch('pungi.phases.createrepo.CreaterepoWrapper')
def test_variant_repo_modules_artifacts(
self, CreaterepoWrapperCls, run):
if not HAS_MODULE_SUPPORT:
self.skipTest("Skipped test, no module support.")
compose = DummyCompose(self.topdir, {
'createrepo_checksum': 'sha256',
})