From 00c2313226e655a66a1b047d298a57e53304bf8d Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 28 Sep 2020 14:16:20 +0200 Subject: [PATCH] test/builder: use handler factory everywhere Convert all tests so they use the new handler factory method. --- test/unit/test_builder.py | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/test/unit/test_builder.py b/test/unit/test_builder.py index 6c4ffed..7fe957c 100644 --- a/test/unit/test_builder.py +++ b/test/unit/test_builder.py @@ -396,14 +396,7 @@ class TestBuilderPlugin(PluginTest): @httpretty.activate def test_bad_request(self): # Simulate a bad request by asking for an unsupported architecture - session = self.mock_session() - options = self.mock_options() - - handler = self.plugin.OSBuildImage(1, - "osbuildImage", - "params", - session, - options) + handler = self.make_handler() args = ["name", "version", "distro", ["image_type"], @@ -424,13 +417,7 @@ class TestBuilderPlugin(PluginTest): def test_compose_success(self): # Simulate a successful compose, check return value session = self.mock_session() - options = self.mock_options() - - handler = self.plugin.OSBuildImage(1, - "osbuildImage", - "params", - session, - options) + handler = self.make_handler(session=session) repos = ["http://1.repo", "https://2.repo"] args = ["name", "version", "distro", @@ -464,13 +451,7 @@ class TestBuilderPlugin(PluginTest): def test_compose_failure(self): # Simulate a failed compose, check exception is raised session = self.mock_session() - options = self.mock_options() - - handler = self.plugin.OSBuildImage(1, - "osbuildImage", - "params", - session, - options) + handler = self.make_handler(session=session) args = ["name", "version", "distro", ["image_type"],