From 3f51470d9cc950dfc1b4913b85502f2af404a48f Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 12 Nov 2020 13:59:30 +0100 Subject: [PATCH] test/builder: use multiple arches in build check In the builder unit test that checks a successful compose, use more than one architecture, and check that an image request was created for all of those. This should expose bugs multi-arch specific bugs. --- test/unit/test_builder.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/unit/test_builder.py b/test/unit/test_builder.py index 2cbf152..68750b2 100644 --- a/test/unit/test_builder.py +++ b/test/unit/test_builder.py @@ -419,15 +419,16 @@ class TestBuilderPlugin(PluginTest): session = self.mock_session() handler = self.make_handler(session=session) + arches = ["x86_64", "s390x"] repos = ["http://1.repo", "https://2.repo"] args = ["name", "version", "distro", ["image_type"], "fedora-candidate", - ["x86_64"], + arches, {"repo": repos}] url = self.plugin.DEFAULT_COMPOSER_URL - composer = MockComposer(url, architectures=["x86_64"]) + composer = MockComposer(url, architectures=arches) composer.httpretty_regsiter() res = handler.handler(*args) @@ -437,8 +438,13 @@ class TestBuilderPlugin(PluginTest): self.assertIsNotNone(compose) ireqs = compose["request"]["image_requests"] + + # Check we got all the requested architectures + ireq_arches = [i["architecture"] for i in ireqs] + diff = set(arches) ^ set(ireq_arches) + self.assertEqual(diff, set()) + for ir in ireqs: - self.assertEqual(ir["architecture"], "x86_64") have = [r["baseurl"] for r in ir["repositories"]] self.assertEqual(have, repos)