2016-04-21 10:20:31 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
2018-04-06 13:28:33 +00:00
|
|
|
import json
|
2016-04-21 10:20:31 +00:00
|
|
|
import mock
|
|
|
|
import os
|
2017-06-20 14:26:30 +00:00
|
|
|
import re
|
2018-04-06 13:28:33 +00:00
|
|
|
import sys
|
|
|
|
try:
|
|
|
|
import unittest2 as unittest
|
|
|
|
except ImportError:
|
|
|
|
import unittest
|
2016-04-21 10:20:31 +00:00
|
|
|
|
2019-06-11 10:28:56 +00:00
|
|
|
from six.moves import cPickle as pickle
|
|
|
|
|
2016-04-21 10:20:31 +00:00
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
|
|
|
|
|
|
|
from pungi.phases.pkgset.sources import source_koji
|
|
|
|
from tests import helpers
|
2018-03-16 06:15:01 +00:00
|
|
|
from pungi import Modulemd
|
2016-04-21 10:20:31 +00:00
|
|
|
|
|
|
|
EVENT_INFO = {'id': 15681980, 'ts': 1460956382.81936}
|
|
|
|
TAG_INFO = {
|
|
|
|
"maven_support": False,
|
|
|
|
"locked": False,
|
|
|
|
"name": "f25",
|
|
|
|
"extra": {
|
|
|
|
"mock.package_manager": "dnf"
|
|
|
|
},
|
|
|
|
"perm": None,
|
|
|
|
"id": 335,
|
|
|
|
"arches": None,
|
|
|
|
"maven_include_all": None,
|
|
|
|
"perm_id": None
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class TestGetKojiEvent(helpers.PungiTestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
super(TestGetKojiEvent, self).setUp()
|
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {})
|
|
|
|
|
|
|
|
self.event_file = self.topdir + '/work/global/koji-event'
|
|
|
|
|
|
|
|
def test_use_preconfigured_event(self):
|
|
|
|
koji_wrapper = mock.Mock()
|
|
|
|
self.compose.koji_event = 123456
|
|
|
|
|
|
|
|
koji_wrapper.koji_proxy.getEvent.return_value = EVENT_INFO
|
|
|
|
|
|
|
|
event = source_koji.get_koji_event_info(self.compose, koji_wrapper)
|
|
|
|
|
|
|
|
self.assertEqual(event, EVENT_INFO)
|
|
|
|
self.assertItemsEqual(
|
|
|
|
koji_wrapper.mock_calls,
|
|
|
|
[mock.call.koji_proxy.getEvent(123456)])
|
|
|
|
with open(self.event_file) as f:
|
|
|
|
self.assertEqual(json.load(f), EVENT_INFO)
|
|
|
|
|
|
|
|
def test_gets_last_event(self):
|
|
|
|
self.compose.koji_event = None
|
|
|
|
koji_wrapper = mock.Mock()
|
|
|
|
|
|
|
|
koji_wrapper.koji_proxy.getLastEvent.return_value = EVENT_INFO
|
|
|
|
|
|
|
|
event = source_koji.get_koji_event_info(self.compose, koji_wrapper)
|
|
|
|
|
|
|
|
self.assertEqual(event, EVENT_INFO)
|
|
|
|
self.assertItemsEqual(
|
|
|
|
koji_wrapper.mock_calls,
|
|
|
|
[mock.call.koji_proxy.getLastEvent()])
|
|
|
|
with open(self.event_file) as f:
|
|
|
|
self.assertEqual(json.load(f), EVENT_INFO)
|
|
|
|
|
2017-06-14 12:04:54 +00:00
|
|
|
|
2016-04-21 10:20:31 +00:00
|
|
|
class TestPopulateGlobalPkgset(helpers.PungiTestCase):
|
|
|
|
def setUp(self):
|
|
|
|
super(TestPopulateGlobalPkgset, self).setUp()
|
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {
|
|
|
|
'pkgset_koji_tag': 'f25',
|
2019-07-25 08:15:14 +00:00
|
|
|
'sigkeys': ["foo", "bar"],
|
2016-04-21 10:20:31 +00:00
|
|
|
})
|
|
|
|
self.koji_wrapper = mock.Mock()
|
|
|
|
self.pkgset_path = os.path.join(self.topdir, 'work', 'global', 'pkgset_global.pickle')
|
2018-06-15 07:26:38 +00:00
|
|
|
self.koji_module_path = os.path.join(self.topdir, 'work', 'global', 'koji-module-Server.yaml')
|
2016-04-21 10:20:31 +00:00
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
@unittest.skip("TODO not working now")
|
2017-09-05 08:01:21 +00:00
|
|
|
@mock.patch('six.moves.cPickle.dumps')
|
2016-04-21 10:20:31 +00:00
|
|
|
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet')
|
|
|
|
def test_populate(self, KojiPackageSet, pickle_dumps):
|
|
|
|
|
2017-09-05 08:01:21 +00:00
|
|
|
pickle_dumps.return_value = b'DATA'
|
2016-04-21 10:20:31 +00:00
|
|
|
|
|
|
|
orig_pkgset = KojiPackageSet.return_value
|
|
|
|
|
|
|
|
pkgset = source_koji.populate_global_pkgset(
|
2017-02-28 13:03:36 +00:00
|
|
|
self.compose, self.koji_wrapper, '/prefix', 123456)
|
2016-04-21 10:20:31 +00:00
|
|
|
|
|
|
|
self.assertIs(pkgset, orig_pkgset)
|
|
|
|
self.assertEqual(
|
|
|
|
pkgset.mock_calls,
|
2018-06-25 12:35:32 +00:00
|
|
|
[
|
|
|
|
mock.call.populate(
|
|
|
|
'f25',
|
|
|
|
123456,
|
|
|
|
inherit=True,
|
|
|
|
logfile=self.topdir + '/logs/global/packages_from_f25.global.log',
|
2019-03-18 12:18:42 +00:00
|
|
|
include_packages=set(),
|
2018-06-25 12:35:32 +00:00
|
|
|
),
|
|
|
|
mock.call.save_file_list(
|
|
|
|
self.topdir + '/work/global/package_list/global.conf',
|
|
|
|
remove_path_prefix='/prefix',
|
|
|
|
),
|
|
|
|
mock.call.save_file_cache(
|
|
|
|
self.topdir + '/work/global/pkgset_file_cache.pickle'
|
|
|
|
),
|
|
|
|
]
|
|
|
|
)
|
2016-04-21 10:20:31 +00:00
|
|
|
self.assertItemsEqual(pickle_dumps.call_args_list,
|
2019-06-11 10:28:56 +00:00
|
|
|
[mock.call(orig_pkgset, protocol=pickle.HIGHEST_PROTOCOL)])
|
2016-04-21 10:20:31 +00:00
|
|
|
with open(self.pkgset_path) as f:
|
|
|
|
self.assertEqual(f.read(), 'DATA')
|
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
@unittest.skip("TODO not working now")
|
2017-09-05 08:01:21 +00:00
|
|
|
@mock.patch('six.moves.cPickle.dumps')
|
2017-06-27 11:48:02 +00:00
|
|
|
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet')
|
|
|
|
def test_populate_with_multiple_koji_tags(self, KojiPackageSet, pickle_dumps):
|
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {
|
|
|
|
'pkgset_koji_tag': ['f25', 'f25-extra'],
|
2019-07-25 08:15:14 +00:00
|
|
|
'sigkeys': ["foo", "bar"],
|
2017-06-27 11:48:02 +00:00
|
|
|
})
|
|
|
|
|
2017-09-05 08:01:21 +00:00
|
|
|
pickle_dumps.return_value = b'DATA'
|
2017-06-27 11:48:02 +00:00
|
|
|
|
|
|
|
orig_pkgset = KojiPackageSet.return_value
|
|
|
|
|
|
|
|
pkgset = source_koji.populate_global_pkgset(
|
|
|
|
self.compose, self.koji_wrapper, '/prefix', 123456)
|
|
|
|
|
|
|
|
self.assertIs(pkgset, orig_pkgset)
|
2018-06-25 12:35:32 +00:00
|
|
|
pkgset.assert_has_calls(
|
|
|
|
[
|
|
|
|
mock.call.populate(
|
|
|
|
'f25',
|
|
|
|
123456,
|
|
|
|
inherit=True,
|
|
|
|
logfile=self.topdir + '/logs/global/packages_from_f25.global.log',
|
2019-03-18 12:18:42 +00:00
|
|
|
include_packages=set(),
|
2018-06-25 12:35:32 +00:00
|
|
|
),
|
|
|
|
]
|
|
|
|
)
|
|
|
|
pkgset.assert_has_calls(
|
|
|
|
[
|
|
|
|
mock.call.populate(
|
|
|
|
'f25-extra',
|
|
|
|
123456,
|
|
|
|
inherit=True,
|
|
|
|
logfile=self.topdir + '/logs/global/packages_from_f25-extra.global.log',
|
2019-03-18 12:18:42 +00:00
|
|
|
include_packages=set(),
|
2018-06-25 12:35:32 +00:00
|
|
|
),
|
|
|
|
]
|
|
|
|
)
|
2017-06-27 11:48:02 +00:00
|
|
|
pkgset.assert_has_calls([mock.call.save_file_list(self.topdir + '/work/global/package_list/global.conf',
|
|
|
|
remove_path_prefix='/prefix')])
|
2018-03-07 12:59:12 +00:00
|
|
|
# for each tag, call pkgset.fast_merge once for each variant and once for global pkgset
|
|
|
|
self.assertEqual(pkgset.fast_merge.call_count, 2 * (len(self.compose.all_variants.values()) + 1))
|
2017-06-27 11:48:02 +00:00
|
|
|
self.assertItemsEqual(pickle_dumps.call_args_list,
|
2019-06-11 10:28:56 +00:00
|
|
|
[mock.call(orig_pkgset, protocol=pickle.HIGHEST_PROTOCOL)])
|
2017-06-27 11:48:02 +00:00
|
|
|
with open(self.pkgset_path) as f:
|
|
|
|
self.assertEqual(f.read(), 'DATA')
|
|
|
|
|
2017-09-05 08:01:21 +00:00
|
|
|
@mock.patch('six.moves.cPickle.dumps')
|
2017-10-16 12:20:37 +00:00
|
|
|
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet.populate')
|
|
|
|
@mock.patch('pungi.phases.pkgset.pkgsets.KojiPackageSet.save_file_list')
|
|
|
|
def test_populate_packages_to_gather(self, save_file_list, popuplate,
|
|
|
|
pickle_dumps):
|
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {
|
|
|
|
'gather_method': 'nodeps',
|
|
|
|
'pkgset_koji_tag': 'f25',
|
2019-07-25 08:15:14 +00:00
|
|
|
'sigkeys': ["foo", "bar"],
|
2017-10-16 12:20:37 +00:00
|
|
|
'additional_packages': [
|
|
|
|
('.*', {'*': ['pkg', 'foo.x86_64']}),
|
|
|
|
]
|
|
|
|
})
|
2017-09-05 08:01:21 +00:00
|
|
|
pickle_dumps.return_value = b'DATA'
|
2017-10-16 12:20:37 +00:00
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
pkgsets = source_koji.populate_global_pkgset(
|
2017-10-16 12:20:37 +00:00
|
|
|
self.compose, self.koji_wrapper, '/prefix', 123456)
|
2019-07-26 14:06:53 +00:00
|
|
|
self.assertEqual(len(pkgsets), 1)
|
|
|
|
self.assertItemsEqual(pkgsets[0].packages, ["pkg", "foo"])
|
2017-10-16 12:20:37 +00:00
|
|
|
|
2016-04-21 10:20:31 +00:00
|
|
|
|
|
|
|
class TestGetPackageSetFromKoji(helpers.PungiTestCase):
|
|
|
|
def setUp(self):
|
|
|
|
super(TestGetPackageSetFromKoji, self).setUp()
|
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {
|
|
|
|
'pkgset_koji_tag': 'f25',
|
|
|
|
})
|
|
|
|
self.compose.koji_event = None
|
|
|
|
self.koji_wrapper = mock.Mock()
|
|
|
|
self.koji_wrapper.koji_proxy.getLastEvent.return_value = EVENT_INFO
|
|
|
|
self.koji_wrapper.koji_proxy.getTag.return_value = TAG_INFO
|
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
@unittest.skip("TODO not working now")
|
2019-07-24 12:08:34 +00:00
|
|
|
@mock.patch('pungi.phases.pkgset.common.create_arch_repos')
|
2016-04-21 10:20:31 +00:00
|
|
|
@mock.patch('pungi.phases.pkgset.sources.source_koji.populate_global_pkgset')
|
2019-07-26 14:06:53 +00:00
|
|
|
def test_get_package_sets(self, pgp, car):
|
|
|
|
expected = {"x86_64": mock.Mock(), "global": pgp.return_value}
|
2016-04-21 10:20:31 +00:00
|
|
|
|
2019-07-26 11:19:39 +00:00
|
|
|
def mock_create_arch_repos(compose, path_prefix, paths):
|
|
|
|
for arch in compose.get_arches():
|
|
|
|
paths[arch] = "/repo/for/" + arch
|
|
|
|
|
|
|
|
car.side_effect = mock_create_arch_repos
|
|
|
|
|
2016-04-21 10:20:31 +00:00
|
|
|
pkgsets = source_koji.get_pkgset_from_koji(self.compose, self.koji_wrapper, '/prefix')
|
|
|
|
|
|
|
|
self.assertItemsEqual(
|
|
|
|
self.koji_wrapper.koji_proxy.mock_calls,
|
2017-02-28 13:03:36 +00:00
|
|
|
[mock.call.getLastEvent()]
|
2016-04-21 10:20:31 +00:00
|
|
|
)
|
2017-02-28 13:03:36 +00:00
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
self.assertEqual(len(pkgsets), 1)
|
2016-04-21 10:20:31 +00:00
|
|
|
self.assertEqual(pgp.call_args_list,
|
|
|
|
[mock.call(self.compose, self.koji_wrapper, '/prefix',
|
2017-02-28 13:03:36 +00:00
|
|
|
EVENT_INFO)])
|
2019-07-26 11:19:39 +00:00
|
|
|
global_repo = os.path.join(self.topdir, "work/global/repo")
|
|
|
|
self.assertItemsEqual(
|
|
|
|
car.call_args_list,
|
2019-07-26 14:06:53 +00:00
|
|
|
[mock.call(self.compose, "/prefix", pkgsets[0].paths)],
|
2019-07-26 11:19:39 +00:00
|
|
|
)
|
2016-04-21 10:20:31 +00:00
|
|
|
|
2019-07-26 14:06:53 +00:00
|
|
|
self.assertEqual(pkgsets[0].package_sets, expected)
|
2019-07-26 11:19:39 +00:00
|
|
|
self.assertEqual(
|
2019-07-26 14:06:53 +00:00
|
|
|
pkgsets[0].paths,
|
2019-07-26 11:19:39 +00:00
|
|
|
{
|
|
|
|
"amd64": "/repo/for/amd64",
|
|
|
|
"global": global_repo,
|
|
|
|
"x86_64": "/repo/for/x86_64",
|
|
|
|
}
|
|
|
|
)
|
2016-04-21 10:20:31 +00:00
|
|
|
|
2018-06-15 07:26:38 +00:00
|
|
|
def test_get_koji_modules(self):
|
2018-07-18 08:22:33 +00:00
|
|
|
mock_build_ids = [{'id': 1065873, 'name': 'testmodule2-master_dash-20180406051653.96c371af'}]
|
2018-06-15 07:26:38 +00:00
|
|
|
mock_extra = {
|
|
|
|
'typeinfo': {
|
|
|
|
'module': {
|
|
|
|
'content_koji_tag': 'module-b62270b82443edde',
|
2018-10-23 13:10:29 +00:00
|
|
|
'modulemd_str': mock.Mock(),
|
|
|
|
'name': 'testmodule2',
|
|
|
|
'stream': 'master',
|
|
|
|
'version': '20180406051653',
|
|
|
|
'context': '96c371af',
|
|
|
|
}
|
2018-06-15 07:26:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
mock_build_md = [
|
|
|
|
{
|
|
|
|
'id': 1065873,
|
|
|
|
'epoch': None,
|
|
|
|
'extra': mock_extra,
|
|
|
|
'name': 'testmodule2',
|
2018-07-18 08:22:33 +00:00
|
|
|
'nvr': 'testmodule2-master_dash-20180406051653.2e6f5e0a',
|
2018-06-15 07:26:38 +00:00
|
|
|
'release': '20180406051653.2e6f5e0a',
|
|
|
|
'state': 1,
|
2018-07-18 08:22:33 +00:00
|
|
|
'version': 'master_dash',
|
2018-08-29 11:02:29 +00:00
|
|
|
'completion_ts': 1433473124.0,
|
2018-06-15 07:26:38 +00:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
self.koji_wrapper.koji_proxy.search.return_value = mock_build_ids
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.return_value = mock_build_md[0]
|
2018-08-29 11:02:29 +00:00
|
|
|
event = {"id": 12345, "ts": 1533473124.0}
|
2018-06-15 07:26:38 +00:00
|
|
|
|
2018-07-18 08:22:33 +00:00
|
|
|
module_info_str = "testmodule2:master-dash:20180406051653:96c371af"
|
2018-08-29 11:02:29 +00:00
|
|
|
result = source_koji.get_koji_modules(
|
|
|
|
self.compose, self.koji_wrapper, event, module_info_str
|
|
|
|
)
|
2018-06-15 07:26:38 +00:00
|
|
|
|
|
|
|
assert type(result) is list
|
|
|
|
assert len(result) == 1
|
|
|
|
module = result[0]
|
|
|
|
assert type(module) is dict
|
2019-04-30 10:22:13 +00:00
|
|
|
self.assertIn("module_stream", module)
|
|
|
|
self.assertIn("module_version", module)
|
|
|
|
self.assertIn("module_context", module)
|
|
|
|
self.assertIn("tag", module)
|
2018-06-15 07:26:38 +00:00
|
|
|
|
2018-07-18 08:22:33 +00:00
|
|
|
expected_query = "testmodule2-master_dash-20180406051653.96c371af"
|
2018-06-15 07:26:38 +00:00
|
|
|
self.koji_wrapper.koji_proxy.search.assert_called_once_with(expected_query, "build",
|
|
|
|
"glob")
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.assert_called_once_with(mock_build_ids[0]["id"])
|
|
|
|
|
2018-08-29 11:02:29 +00:00
|
|
|
def test_get_koji_modules_filter_by_event(self):
|
|
|
|
mock_build_ids = [
|
|
|
|
{"id": 1065873, "name": "testmodule2-master_dash-20180406051653.96c371af"}
|
|
|
|
]
|
|
|
|
mock_extra = {
|
|
|
|
"typeinfo": {
|
|
|
|
"module": {
|
|
|
|
"content_koji_tag": "module-b62270b82443edde",
|
|
|
|
"modulemd_str": mock.Mock()}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mock_build_md = [
|
|
|
|
{
|
|
|
|
"id": 1065873,
|
|
|
|
"epoch": None,
|
|
|
|
"extra": mock_extra,
|
|
|
|
"name": "testmodule2",
|
|
|
|
"nvr": "testmodule2-master_dash-20180406051653.2e6f5e0a",
|
|
|
|
"release": "20180406051653.2e6f5e0a",
|
|
|
|
"state": 1,
|
|
|
|
"version": "master_dash",
|
|
|
|
"completion_ts": 1633473124.0,
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
self.koji_wrapper.koji_proxy.search.return_value = mock_build_ids
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.return_value = mock_build_md[0]
|
|
|
|
event = {"id": 12345, "ts": 1533473124.0}
|
|
|
|
|
|
|
|
with self.assertRaises(ValueError) as ctx:
|
|
|
|
source_koji.get_koji_modules(
|
|
|
|
self.compose, self.koji_wrapper, event, "testmodule2:master-dash"
|
|
|
|
)
|
|
|
|
|
|
|
|
self.assertIn("No module build found", str(ctx.exception))
|
|
|
|
|
|
|
|
self.koji_wrapper.koji_proxy.search.assert_called_once_with(
|
|
|
|
"testmodule2-master_dash-*", "build", "glob"
|
|
|
|
)
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.assert_called_once_with(mock_build_ids[0]["id"])
|
|
|
|
self.koji_wrapper.koji_proxy.listArchives.assert_not_called()
|
|
|
|
self.koji_wrapper.koji_proxy.listRPMs.assert_not_called()
|
|
|
|
|
2018-06-15 07:26:38 +00:00
|
|
|
def test_get_koji_modules_no_version(self):
|
|
|
|
mock_build_ids = [
|
|
|
|
{'id': 1065873, 'name': 'testmodule2-master-20180406051653.2e6f5e0a'},
|
|
|
|
{'id': 1065874, 'name': 'testmodule2-master-20180406051653.96c371af'}
|
|
|
|
]
|
|
|
|
mock_extra = [
|
|
|
|
{
|
|
|
|
'typeinfo': {
|
|
|
|
'module': {
|
|
|
|
'content_koji_tag': 'module-b62270b82443edde',
|
2018-10-23 13:10:29 +00:00
|
|
|
'modulemd_str': mock.Mock(),
|
|
|
|
'name': 'testmodule2',
|
|
|
|
'stream': 'master',
|
|
|
|
'version': '20180406051653',
|
|
|
|
'context': '2e6f5e0a',
|
|
|
|
}
|
2018-06-15 07:26:38 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
'typeinfo': {
|
|
|
|
'module': {
|
|
|
|
'content_koji_tag': 'module-52e40b9cdd3c0f7d',
|
2018-10-23 13:10:29 +00:00
|
|
|
'modulemd_str': mock.Mock(),
|
|
|
|
'name': 'testmodule2',
|
|
|
|
'stream': 'master',
|
|
|
|
'version': '20180406051653',
|
|
|
|
'context': '96c371af',
|
|
|
|
}
|
2018-06-15 07:26:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
]
|
|
|
|
mock_build_md = [
|
|
|
|
{
|
|
|
|
'id': 1065873,
|
|
|
|
'epoch': None,
|
|
|
|
'extra': mock_extra[0],
|
|
|
|
'name': 'testmodule2',
|
|
|
|
'nvr': 'testmodule2-master-20180406051653.2e6f5e0a',
|
|
|
|
'release': '20180406051653.2e6f5e0a',
|
|
|
|
'state': 1,
|
|
|
|
'version': 'master',
|
2018-08-29 11:02:29 +00:00
|
|
|
'completion_ts': 1433473124.0,
|
2018-06-15 07:26:38 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
'id': 1065874,
|
|
|
|
'epoch': None,
|
|
|
|
'extra': mock_extra[1],
|
|
|
|
'name': 'testmodule2',
|
|
|
|
'nvr': 'testmodule2-master-20180406051653.96c371af',
|
|
|
|
'release': '20180406051653.96c371af',
|
|
|
|
'state': 1,
|
|
|
|
'version': 'master',
|
2018-08-29 11:02:29 +00:00
|
|
|
'completion_ts': 1433473124.0,
|
2018-06-15 07:26:38 +00:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
self.koji_wrapper.koji_proxy.search.return_value = mock_build_ids
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.side_effect = mock_build_md
|
|
|
|
|
2018-08-29 11:02:29 +00:00
|
|
|
event = {"id": 12345, "ts": 1533473124.0}
|
|
|
|
|
2018-06-15 07:26:38 +00:00
|
|
|
module_info_str = "testmodule2:master"
|
2018-08-29 11:02:29 +00:00
|
|
|
result = source_koji.get_koji_modules(
|
|
|
|
self.compose, self.koji_wrapper, event, module_info_str
|
|
|
|
)
|
2018-06-15 07:26:38 +00:00
|
|
|
|
|
|
|
assert type(result) is list
|
|
|
|
assert len(result) == 2
|
|
|
|
module = result[0]
|
|
|
|
for module in result:
|
|
|
|
assert type(module) is dict
|
2019-04-30 10:22:13 +00:00
|
|
|
self.assertIn("module_stream", module)
|
|
|
|
self.assertIn("module_version", module)
|
|
|
|
self.assertIn("module_context", module)
|
2018-06-15 07:26:38 +00:00
|
|
|
|
|
|
|
expected_query = "testmodule2-master-*"
|
|
|
|
self.koji_wrapper.koji_proxy.search.assert_called_once_with(expected_query, "build",
|
|
|
|
"glob")
|
|
|
|
|
|
|
|
expected_calls = [mock.call(mock_build_ids[0]["id"]), mock.call(mock_build_ids[1]["id"])]
|
|
|
|
self.koji_wrapper.koji_proxy.getBuild.mock_calls == expected_calls
|
|
|
|
|
2016-04-21 10:20:31 +00:00
|
|
|
|
|
|
|
class TestSourceKoji(helpers.PungiTestCase):
|
|
|
|
|
|
|
|
@mock.patch('pungi.phases.pkgset.sources.source_koji.get_pkgset_from_koji')
|
|
|
|
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
|
|
|
|
def test_run(self, KojiWrapper, gpfk):
|
|
|
|
compose = helpers.DummyCompose(self.topdir, {
|
|
|
|
'koji_profile': 'koji'
|
|
|
|
})
|
|
|
|
KojiWrapper.return_value.koji_module.config.topdir = '/prefix'
|
|
|
|
|
|
|
|
phase = source_koji.PkgsetSourceKoji(compose)
|
|
|
|
pkgsets, path_prefix = phase()
|
|
|
|
|
|
|
|
self.assertEqual(pkgsets, gpfk.return_value)
|
|
|
|
self.assertEqual(path_prefix, '/prefix/')
|
|
|
|
self.assertItemsEqual(KojiWrapper.mock_calls,
|
|
|
|
[mock.call('koji')])
|
|
|
|
|
|
|
|
|
2017-06-20 14:26:30 +00:00
|
|
|
class TestCorrectNVR(helpers.PungiTestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
super(TestCorrectNVR, self).setUp()
|
2017-10-20 08:41:30 +00:00
|
|
|
self.compose = helpers.DummyCompose(self.topdir, {})
|
2017-06-20 14:26:30 +00:00
|
|
|
self.nv = "base-runtime-f26"
|
|
|
|
self.nvr = "base-runtime-f26-20170502134116"
|
2019-05-15 13:47:44 +00:00
|
|
|
self.release_regex = re.compile(r"^(\d){14}$")
|
2017-10-20 08:41:30 +00:00
|
|
|
self.new_nv = "base-runtime:f26"
|
|
|
|
self.new_nvr = "base-runtime:f26:20170502134116"
|
|
|
|
self.new_nvrc = "base-runtime:f26:20170502134116:0123abcd"
|
2017-06-20 14:26:30 +00:00
|
|
|
|
|
|
|
def test_nv(self):
|
2017-10-20 08:41:30 +00:00
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.nv)
|
2018-04-16 12:47:49 +00:00
|
|
|
expectedKeys = ["stream", "name"]
|
2017-06-20 14:26:30 +00:00
|
|
|
self.assertItemsEqual(module_info.keys(), expectedKeys)
|
|
|
|
|
|
|
|
def test_nvr(self):
|
2017-10-20 08:41:30 +00:00
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.nvr)
|
2018-04-16 12:47:49 +00:00
|
|
|
expectedKeys = ["stream", "name", "version"]
|
2017-06-20 14:26:30 +00:00
|
|
|
self.assertItemsEqual(module_info.keys(), expectedKeys)
|
|
|
|
|
|
|
|
def test_correct_release(self):
|
2017-10-20 08:41:30 +00:00
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.nvr)
|
2018-04-16 12:47:49 +00:00
|
|
|
self.assertIsNotNone(self.release_regex.match(module_info["version"]))
|
2017-06-20 14:26:30 +00:00
|
|
|
|
2017-10-20 08:41:30 +00:00
|
|
|
def test_new_nv(self):
|
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.new_nv)
|
|
|
|
expected = {
|
2018-04-16 12:47:49 +00:00
|
|
|
'name': 'base-runtime',
|
|
|
|
'stream': 'f26'}
|
2017-10-20 08:41:30 +00:00
|
|
|
|
|
|
|
self.assertEqual(module_info, expected)
|
|
|
|
|
|
|
|
def test_new_nvr(self):
|
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.new_nvr)
|
|
|
|
expected = {
|
2018-04-16 12:47:49 +00:00
|
|
|
'name': 'base-runtime',
|
|
|
|
'stream': 'f26',
|
|
|
|
'version': '20170502134116'}
|
2017-10-20 08:41:30 +00:00
|
|
|
self.assertEqual(module_info, expected)
|
|
|
|
|
|
|
|
def test_new_nvrc(self):
|
2018-04-26 07:01:13 +00:00
|
|
|
module_info = source_koji.variant_dict_from_str(self.compose, self.new_nvrc)
|
|
|
|
expected = {
|
|
|
|
'name': 'base-runtime',
|
|
|
|
'stream': 'f26',
|
|
|
|
'version': '20170502134116',
|
|
|
|
'context': '0123abcd'}
|
|
|
|
self.assertEqual(module_info, expected)
|
|
|
|
|
|
|
|
def test_new_garbage_value(self):
|
2017-10-20 08:41:30 +00:00
|
|
|
self.assertRaises(ValueError, source_koji.variant_dict_from_str,
|
2018-04-26 07:01:13 +00:00
|
|
|
self.compose, 'foo:bar:baz:quux:qaar')
|
2017-06-20 14:26:30 +00:00
|
|
|
|
2018-04-16 12:47:49 +00:00
|
|
|
|
2018-08-30 09:12:58 +00:00
|
|
|
class TestFilterInherited(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_empty_module_list(self):
|
|
|
|
event = {"id": 123456}
|
|
|
|
koji_proxy = mock.Mock()
|
|
|
|
module_builds = []
|
|
|
|
top_tag = "top-tag"
|
|
|
|
|
|
|
|
koji_proxy.getFullInheritance.return_value = [
|
|
|
|
{"name": "middle-tag"}, {"name": "bottom-tag"}
|
|
|
|
]
|
|
|
|
|
|
|
|
result = source_koji.filter_inherited(koji_proxy, event, module_builds, top_tag)
|
|
|
|
|
|
|
|
self.assertItemsEqual(result, [])
|
|
|
|
self.assertEqual(
|
|
|
|
koji_proxy.mock_calls,
|
|
|
|
[mock.call.getFullInheritance("top-tag", event=123456)],
|
|
|
|
)
|
|
|
|
|
|
|
|
def test_exclude_middle_and_bottom_tag(self):
|
|
|
|
event = {"id": 123456}
|
|
|
|
koji_proxy = mock.Mock()
|
|
|
|
top_tag = "top-tag"
|
|
|
|
|
|
|
|
koji_proxy.getFullInheritance.return_value = [
|
|
|
|
{"name": "middle-tag"}, {"name": "bottom-tag"}
|
|
|
|
]
|
|
|
|
module_builds = [
|
|
|
|
{"name": "foo", "version": "1", "release": "1", "tag_name": "top-tag"},
|
|
|
|
{"name": "foo", "version": "1", "release": "2", "tag_name": "bottom-tag"},
|
|
|
|
{"name": "foo", "version": "1", "release": "3", "tag_name": "middle-tag"},
|
|
|
|
]
|
|
|
|
|
|
|
|
result = source_koji.filter_inherited(koji_proxy, event, module_builds, top_tag)
|
|
|
|
|
|
|
|
self.assertItemsEqual(
|
|
|
|
result,
|
|
|
|
[{"name": "foo", "version": "1", "release": "1", "tag_name": "top-tag"}],
|
|
|
|
)
|
|
|
|
self.assertEqual(
|
|
|
|
koji_proxy.mock_calls,
|
|
|
|
[mock.call.getFullInheritance("top-tag", event=123456)],
|
|
|
|
)
|
|
|
|
|
|
|
|
def test_missing_from_top_tag(self):
|
|
|
|
event = {"id": 123456}
|
|
|
|
koji_proxy = mock.Mock()
|
|
|
|
top_tag = "top-tag"
|
|
|
|
|
|
|
|
koji_proxy.getFullInheritance.return_value = [
|
|
|
|
{"name": "middle-tag"}, {"name": "bottom-tag"}
|
|
|
|
]
|
|
|
|
module_builds = [
|
|
|
|
{"name": "foo", "version": "1", "release": "2", "tag_name": "bottom-tag"},
|
|
|
|
{"name": "foo", "version": "1", "release": "3", "tag_name": "middle-tag"},
|
|
|
|
]
|
|
|
|
|
|
|
|
result = source_koji.filter_inherited(koji_proxy, event, module_builds, top_tag)
|
|
|
|
|
|
|
|
self.assertItemsEqual(
|
|
|
|
result,
|
|
|
|
[{"name": "foo", "version": "1", "release": "3", "tag_name": "middle-tag"}],
|
|
|
|
)
|
|
|
|
self.assertEqual(
|
|
|
|
koji_proxy.mock_calls,
|
|
|
|
[mock.call.getFullInheritance("top-tag", event=123456)],
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
class TestFilterByWhitelist(unittest.TestCase):
|
2019-05-03 12:44:16 +00:00
|
|
|
def _build(self, n, s, v, c):
|
|
|
|
s = s.replace("-", "_")
|
|
|
|
return {
|
|
|
|
"nvr": "%s-%s-%s.%s" % (n, s, v, c),
|
|
|
|
"name": n,
|
|
|
|
"version": s,
|
|
|
|
"release": "%s.%s" % (v, c),
|
|
|
|
}
|
|
|
|
|
2018-08-30 09:12:58 +00:00
|
|
|
def test_no_modules(self):
|
|
|
|
compose = mock.Mock()
|
|
|
|
module_builds = []
|
|
|
|
input_modules = [{"name": "foo:1"}]
|
2019-06-13 08:10:30 +00:00
|
|
|
expected = set(["foo:1"])
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
source_koji.filter_by_whitelist(compose, module_builds, input_modules, expected)
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
self.assertEqual(expected, set(["foo:1"]))
|
2018-08-30 09:12:58 +00:00
|
|
|
|
|
|
|
def test_filter_by_NS(self):
|
|
|
|
compose = mock.Mock()
|
|
|
|
module_builds = [
|
2019-05-03 12:44:16 +00:00
|
|
|
self._build("foo", "1", "201809031048", "cafebabe"),
|
|
|
|
self._build("foo", "1", "201809031047", "deadbeef"),
|
|
|
|
self._build("foo", "2", "201809031047", "deadbeef"),
|
2018-08-30 09:12:58 +00:00
|
|
|
]
|
|
|
|
input_modules = [{"name": "foo:1"}]
|
2019-06-13 08:10:30 +00:00
|
|
|
expected = set(["foo:1"])
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
result = source_koji.filter_by_whitelist(
|
|
|
|
compose, module_builds, input_modules, expected
|
|
|
|
)
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-05-03 12:44:16 +00:00
|
|
|
self.assertItemsEqual(result, [module_builds[0], module_builds[1]])
|
2019-06-13 08:10:30 +00:00
|
|
|
self.assertEqual(expected, set())
|
2018-08-30 09:12:58 +00:00
|
|
|
|
|
|
|
def test_filter_by_NSV(self):
|
|
|
|
compose = mock.Mock()
|
|
|
|
module_builds = [
|
2019-05-03 12:44:16 +00:00
|
|
|
self._build("foo", "1", "201809031048", "cafebabe"),
|
|
|
|
self._build("foo", "1", "201809031047", "deadbeef"),
|
|
|
|
self._build("foo", "2", "201809031047", "deadbeef"),
|
2018-08-30 09:12:58 +00:00
|
|
|
]
|
|
|
|
input_modules = [{"name": "foo:1:201809031047"}]
|
2019-06-13 08:10:30 +00:00
|
|
|
expected = set(["foo:1:201809031047"])
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
result = source_koji.filter_by_whitelist(
|
|
|
|
compose, module_builds, input_modules, expected
|
|
|
|
)
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-05-03 12:44:16 +00:00
|
|
|
self.assertItemsEqual(result, [module_builds[1]])
|
2019-06-13 08:10:30 +00:00
|
|
|
self.assertEqual(expected, set())
|
2018-08-30 09:12:58 +00:00
|
|
|
|
|
|
|
def test_filter_by_NSVC(self):
|
|
|
|
compose = mock.Mock()
|
|
|
|
module_builds = [
|
2019-05-03 12:44:16 +00:00
|
|
|
self._build("foo", "1", "201809031048", "cafebabe"),
|
|
|
|
self._build("foo", "1", "201809031047", "deadbeef"),
|
|
|
|
self._build("foo", "1", "201809031047", "cafebabe"),
|
|
|
|
self._build("foo", "2", "201809031047", "deadbeef"),
|
2018-08-30 09:12:58 +00:00
|
|
|
]
|
|
|
|
input_modules = [{"name": "foo:1:201809031047:deadbeef"}]
|
2019-06-13 08:10:30 +00:00
|
|
|
expected = set()
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
result = source_koji.filter_by_whitelist(
|
|
|
|
compose, module_builds, input_modules, expected
|
|
|
|
)
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-05-03 12:44:16 +00:00
|
|
|
self.assertItemsEqual(result, [module_builds[1]])
|
2019-06-13 08:10:30 +00:00
|
|
|
self.assertEqual(expected, set())
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-02-07 12:58:08 +00:00
|
|
|
def test_filter_by_wildcard(self):
|
|
|
|
compose = mock.Mock()
|
|
|
|
module_builds = [
|
2019-05-03 12:44:16 +00:00
|
|
|
self._build("foo", "1", "201809031048", "cafebabe"),
|
|
|
|
self._build("foo", "1", "201809031047", "deadbeef"),
|
|
|
|
self._build("foo", "2", "201809031047", "deadbeef"),
|
2019-02-07 12:58:08 +00:00
|
|
|
]
|
|
|
|
input_modules = [{"name": "*"}]
|
2019-06-13 08:10:30 +00:00
|
|
|
expected = set(["*"])
|
2019-02-07 12:58:08 +00:00
|
|
|
|
2019-06-13 08:10:30 +00:00
|
|
|
result = source_koji.filter_by_whitelist(
|
|
|
|
compose, module_builds, input_modules, expected
|
|
|
|
)
|
2019-02-07 12:58:08 +00:00
|
|
|
|
2019-05-03 12:44:16 +00:00
|
|
|
self.assertItemsEqual(result, module_builds)
|
2019-06-13 08:10:30 +00:00
|
|
|
self.assertEqual(expected, set())
|
2019-02-07 12:58:08 +00:00
|
|
|
|
2018-08-30 09:12:58 +00:00
|
|
|
|
2019-03-14 14:28:22 +00:00
|
|
|
class MockModule(object):
|
2019-07-01 10:11:39 +00:00
|
|
|
def __init__(self, path, strict=True):
|
2019-03-14 14:28:22 +00:00
|
|
|
self.path = path
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "MockModule(%r)" % self.path
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
return self.path == other.path
|
|
|
|
|
|
|
|
|
2019-07-01 10:11:39 +00:00
|
|
|
@mock.patch("pungi.Modulemd.ModuleStream.read_file", new=MockModule)
|
2019-03-25 09:16:43 +00:00
|
|
|
@unittest.skipIf(Modulemd is None, "Skipping tests, no module support")
|
2019-03-14 14:28:22 +00:00
|
|
|
class TestAddModuleToVariant(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.koji = mock.Mock()
|
|
|
|
self.koji.koji_module.pathinfo.typedir.return_value = "/koji"
|
|
|
|
files = ["modulemd.x86_64.txt", "modulemd.armv7hl.txt", "modulemd.txt"]
|
|
|
|
self.koji.koji_proxy.listArchives.return_value = [
|
|
|
|
{"btype": "module", "filename": fname} for fname in files
|
|
|
|
] + [{"btype": "foo"}]
|
2019-06-28 06:42:50 +00:00
|
|
|
self.buildinfo = {
|
|
|
|
"id": 1234,
|
|
|
|
"extra": {
|
|
|
|
"typeinfo": {
|
|
|
|
"module": {
|
|
|
|
"name": "module",
|
|
|
|
"stream": "master",
|
|
|
|
"version": "20190318",
|
|
|
|
"context": "abcdef",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
2019-03-14 14:28:22 +00:00
|
|
|
|
|
|
|
def test_adding_module(self):
|
|
|
|
variant = mock.Mock(
|
2019-07-01 08:27:44 +00:00
|
|
|
arches=["armhfp", "x86_64"], arch_mmds={}, modules=[]
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
2019-06-28 06:42:50 +00:00
|
|
|
source_koji._add_module_to_variant(self.koji, variant, self.buildinfo)
|
2019-03-14 14:28:22 +00:00
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
variant.arch_mmds,
|
|
|
|
{
|
|
|
|
"armhfp": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
"x86_64": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
self.assertEqual(variant.modules, [])
|
|
|
|
|
|
|
|
def test_adding_module_to_existing(self):
|
|
|
|
variant = mock.Mock(
|
|
|
|
arches=["armhfp", "x86_64"],
|
|
|
|
arch_mmds={
|
2019-06-28 06:42:50 +00:00
|
|
|
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
2019-08-05 08:56:44 +00:00
|
|
|
modules=[{"name": "m1:latest-20190101:cafe", "glob": False}],
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
2019-06-28 06:42:50 +00:00
|
|
|
source_koji._add_module_to_variant(self.koji, variant, self.buildinfo)
|
2019-03-14 14:28:22 +00:00
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
variant.arch_mmds,
|
|
|
|
{
|
|
|
|
"armhfp": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
"x86_64": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
|
|
|
"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2019-08-05 08:56:44 +00:00
|
|
|
self.assertEqual(
|
|
|
|
variant.modules, [{"name": "m1:latest-20190101:cafe", "glob": False}]
|
|
|
|
)
|
2019-03-14 14:28:22 +00:00
|
|
|
|
|
|
|
def test_adding_module_with_add_module(self):
|
|
|
|
variant = mock.Mock(
|
2019-07-01 08:27:44 +00:00
|
|
|
arches=["armhfp", "x86_64"], arch_mmds={}, modules=[]
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
source_koji._add_module_to_variant(
|
2019-06-28 06:42:50 +00:00
|
|
|
self.koji, variant, self.buildinfo, add_to_variant_modules=True
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
variant.arch_mmds,
|
|
|
|
{
|
|
|
|
"armhfp": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
"x86_64": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
2019-08-05 08:56:44 +00:00
|
|
|
self.assertEqual(
|
|
|
|
variant.modules, [{"name": "module:master:20190318:abcdef", "glob": False}]
|
|
|
|
)
|
2019-03-14 14:28:22 +00:00
|
|
|
|
|
|
|
def test_adding_module_to_existing_with_add_module(self):
|
|
|
|
variant = mock.Mock(
|
|
|
|
arches=["armhfp", "x86_64"],
|
|
|
|
arch_mmds={
|
2019-06-28 06:42:50 +00:00
|
|
|
"x86_64": {"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt")}
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
2019-08-05 08:56:44 +00:00
|
|
|
modules=[{"name": "m1:latest-20190101:cafe", "glob": False}],
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
source_koji._add_module_to_variant(
|
2019-06-28 06:42:50 +00:00
|
|
|
self.koji, variant, self.buildinfo, add_to_variant_modules=True
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
self.assertEqual(
|
|
|
|
variant.arch_mmds,
|
|
|
|
{
|
|
|
|
"armhfp": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.armv7hl.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
"x86_64": {
|
2019-06-28 06:42:50 +00:00
|
|
|
"module:master:20190318:abcdef": MockModule("/koji/modulemd.x86_64.txt"),
|
|
|
|
"m1:latest:20190101:cafe": MockModule("/koji/m1.x86_64.txt"),
|
2019-03-14 14:28:22 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
self.assertEqual(
|
|
|
|
variant.modules,
|
2019-08-05 08:56:44 +00:00
|
|
|
[
|
|
|
|
{"name": "m1:latest-20190101:cafe", "glob": False},
|
|
|
|
{"name": "module:master:20190318:abcdef", "glob": False},
|
|
|
|
],
|
2019-03-14 14:28:22 +00:00
|
|
|
)
|