f21a2de39b
The support for specifying multiple `image_types` for a single compose
has been removed by [1]. This turned out to be problematic, because e.g.
Pungi uses the array type when triggering image builds via osbuild.
Bring back the support for specifying the `image_type` as an array, but
restrict it to a single item. This will cover the Pungi use-case, since
it is always passing a single `image_type` in the array. The array is
then converted to a string in the Hub plugin and passed as such to the
Builder plugin.
Extend unit tests covering the introduced compatibility layer.
[1] c725265081
103 lines
2.7 KiB
Python
103 lines
2.7 KiB
Python
#
|
|
# koji hub plugin unit tests
|
|
#
|
|
|
|
import jsonschema
|
|
import koji
|
|
from flexmock import flexmock
|
|
|
|
from plugintest import PluginTest
|
|
|
|
|
|
@PluginTest.load_plugin("hub")
|
|
class TestHubPlugin(PluginTest):
|
|
|
|
@staticmethod
|
|
def mock_koji_context(*, admin=False):
|
|
session = flexmock()
|
|
session.should_receive("hasPerm") \
|
|
.with_args("admin") \
|
|
.and_return(admin)
|
|
|
|
session.should_receive("assertPerm") \
|
|
.with_args("image") \
|
|
.once()
|
|
|
|
context = flexmock(session=session)
|
|
return context
|
|
|
|
@staticmethod
|
|
def mock_kojihub(args, task):
|
|
kojihub = flexmock()
|
|
kojihub.should_receive("make_task") \
|
|
.with_args("osbuildImage", args, **task)
|
|
return kojihub
|
|
|
|
def test_plugin_jsonschema(self):
|
|
# Make sure the schema used to validate the input is
|
|
# itself correct jsonschema
|
|
schema = self.plugin.OSBUILD_IMAGE_SCHEMA
|
|
jsonschema.Draft4Validator.check_schema(schema)
|
|
|
|
def test_basic(self):
|
|
context = self.mock_koji_context()
|
|
|
|
opts = {"repo": ["repo1", "repo2"],
|
|
"release": "1.2.3",
|
|
"skip_tag": True}
|
|
args = ["name", "version", "distro",
|
|
"image_type",
|
|
"target",
|
|
["arches"],
|
|
opts]
|
|
|
|
task = {"channel": "image"}
|
|
|
|
kojihub = self.mock_kojihub(args, task)
|
|
|
|
setattr(self.plugin, "context", context)
|
|
setattr(self.plugin, "kojihub", kojihub)
|
|
|
|
self.plugin.osbuildImage(*args, {})
|
|
|
|
def test_image_types_array(self):
|
|
context = self.mock_koji_context()
|
|
|
|
opts = {"repo": ["repo1", "repo2"],
|
|
"release": "1.2.3",
|
|
"skip_tag": True}
|
|
make_task_args = [
|
|
"name", "version", "distro",
|
|
"image_type",
|
|
"target",
|
|
["arches"],
|
|
opts
|
|
]
|
|
args = ["name", "version", "distro",
|
|
["image_type"],
|
|
"target",
|
|
["arches"],
|
|
opts]
|
|
|
|
task = {"channel": "image"}
|
|
|
|
kojihub = self.mock_kojihub(make_task_args, task)
|
|
|
|
setattr(self.plugin, "context", context)
|
|
setattr(self.plugin, "kojihub", kojihub)
|
|
|
|
self.plugin.osbuildImage(*args, {})
|
|
|
|
def test_input_validation(self):
|
|
context = self.mock_koji_context()
|
|
setattr(self.plugin, "context", context)
|
|
|
|
opts = {}
|
|
args = ["name", "version", "distro",
|
|
["image_type", "image_type2"], # only a single image type is allowed
|
|
"target",
|
|
["arches"],
|
|
opts]
|
|
|
|
with self.assertRaises(koji.ParameterError):
|
|
self.plugin.osbuildImage(*args, opts)
|