From cc05c9bca82d495fd19d4176726dc2b2c21b72f3 Mon Sep 17 00:00:00 2001 From: Qixiang Wan Date: Jan 10 2020 10:24:25 +0000 Subject: Remove usage of mutable default arguments FIXES: #457 --- diff --git a/freshmaker/handlers/__init__.py b/freshmaker/handlers/__init__.py index 2cd25b6..f6e917d 100644 --- a/freshmaker/handlers/__init__.py +++ b/freshmaker/handlers/__init__.py @@ -467,7 +467,7 @@ class ContainerBuildHandler(BaseHandler): compose_ids=compose_ids) @fail_artifact_build_on_handler_exception(whitelist=[ODCSComposeNotReady]) - def build_image_artifact_build(self, build, repo_urls=[]): + def build_image_artifact_build(self, build, repo_urls=None): """ Submits ArtifactBuild of 'image' type to Koji. @@ -531,7 +531,7 @@ class ContainerBuildHandler(BaseHandler): # We use repo_urls only in special cases to build base images. In this # cases, we want to convert compose_ids to repository URLs. Otherwise, # just pass compose_ids to OSBS via Koji. - if repo_urls: + if repo_urls is not None: for compose_id in compose_ids: odcs_compose = self.odcs_get_compose(compose_id) if odcs_compose["state"] in [COMPOSE_STATES['wait'], diff --git a/freshmaker/odcsclient.py b/freshmaker/odcsclient.py index 0e103a9..6796c80 100644 --- a/freshmaker/odcsclient.py +++ b/freshmaker/odcsclient.py @@ -99,7 +99,7 @@ class FreshmakerODCSClient(object): self.handler = handler def _fake_odcs_new_compose( - self, compose_source, tag, packages=None, results=[], + self, compose_source, tag, packages=None, results=None, builds=None): """ Fake odcs.new_compose(...) method used in the dry run mode. @@ -125,8 +125,10 @@ class FreshmakerODCSClient(object): new_compose['result_repofile'] = "http://localhost/%d.repo" % ( new_compose['id']) new_compose['state'] = COMPOSE_STATES['done'] - if results: + if results is None: new_compose['results'] = ['boot.iso'] + else: + new_compose['results'] = results if builds: new_compose['builds'] = builds diff --git a/tests/test_handler.py b/tests/test_handler.py index 6d7be04..ff6ab8f 100644 --- a/tests/test_handler.py +++ b/tests/test_handler.py @@ -195,7 +195,7 @@ class TestGetRepoURLs(helpers.ModelsTestCase): build_container.assert_called_once_with( 'git://pkgs.fedoraproject.org/repo#hash', 'branch', 'target', arch_override='x86_64', compose_ids=[5, 6, 7, 8], isolated=True, - koji_parent_build=None, release='2', repo_urls=[]) + koji_parent_build=None, release='2', repo_urls=None) @patch("freshmaker.handlers.ContainerBuildHandler.build_container") def test_build_image_artifact_build_renewed_odcs_composes( @@ -210,7 +210,7 @@ class TestGetRepoURLs(helpers.ModelsTestCase): build_container.assert_called_once_with( 'git://pkgs.fedoraproject.org/repo#hash', 'branch', 'target', arch_override='x86_64', compose_ids=[5, 6, 7, 8, 7300, 7301], - isolated=True, koji_parent_build=None, release='2', repo_urls=[]) + isolated=True, koji_parent_build=None, release='2', repo_urls=None) @patch("freshmaker.handlers.ContainerBuildHandler.build_container") def test_build_image_artifact_build_repo_urls(