From b711d3fe5d97fc027d2d2174c799d18f91faddb4 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 21 Apr 2017 12:53:41 +0200 Subject: [PATCH] pep8: remove trailing white space --- module_build_service/utils.py | 2 +- tests/test_build/test_build.py | 6 +++--- tests/test_messaging.py | 16 ++++++++-------- tests/test_views/test_views.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/module_build_service/utils.py b/module_build_service/utils.py index a4e02e90..7268db1e 100644 --- a/module_build_service/utils.py +++ b/module_build_service/utils.py @@ -227,7 +227,7 @@ def continue_batch_build(config, module, session, builder, components=None): def start_next_batch_build(config, module, session, builder, components=None): """ Tries to start the build of next batch. In case there are still unbuilt - components in a batch, tries to submit more components until it hits + components in a batch, tries to submit more components until it hits concurrent builds limit. Otherwise Increments module.batch and submits component builds from the next batch. diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index c53880ba..f1f25f8e 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -204,7 +204,7 @@ class TestModuleBuilder(GenericBuilder): pass -@patch("module_build_service.config.Config.system", +@patch("module_build_service.config.Config.system", new_callable=PropertyMock, return_value="test") @patch("module_build_service.builder.GenericBuilder.default_buildroot_groups", return_value={ @@ -431,7 +431,7 @@ class TestBuild(unittest.TestCase): @timed(30) @patch('module_build_service.auth.get_user', return_value=user) @patch('module_build_service.scm.SCM') - @patch("module_build_service.config.Config.num_consecutive_builds", + @patch("module_build_service.config.Config.num_consecutive_builds", new_callable=PropertyMock, return_value=1) def test_submit_build_concurrent_threshold(self, conf_num_consecutive_builds, mocked_scm, mocked_get_user, @@ -482,7 +482,7 @@ class TestBuild(unittest.TestCase): conf_system, dbg): """ Tests that we try to submit new component build right after - the previous one finished without waiting for all + the previous one finished without waiting for all the num_consecutive_builds to finish. """ MockedSCM(mocked_scm, 'testmodule-more-components', 'testmodule-more-components.yaml', diff --git a/tests/test_messaging.py b/tests/test_messaging.py index 51661a45..42891b06 100644 --- a/tests/test_messaging.py +++ b/tests/test_messaging.py @@ -95,14 +95,14 @@ class TestFedmsgMessaging(unittest.TestCase): # https://fedora-fedmsg.readthedocs.io/en/latest/topics.html#id134 buildsys_tag_msg = { "msg": { - "build_id": 875961, - "name": "module-build-macros", - "tag_id": 619, - "instance": "primary", - "tag": "module-debugging-tools-master-20170405115403-build", - "user": "mbs/mbs.fedoraproject.org", - "version": "0.1", - "owner": "mbs/mbs.fedoraproject.org", + "build_id": 875961, + "name": "module-build-macros", + "tag_id": 619, + "instance": "primary", + "tag": "module-debugging-tools-master-20170405115403-build", + "user": "mbs/mbs.fedoraproject.org", + "version": "0.1", + "owner": "mbs/mbs.fedoraproject.org", "release": "1.module_0c3d13fd" }, 'msg_id': '2015-51be4c8e-8ab6-4dcb-ac0d-37b257765c71', diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index 0cef4ec2..9f8ba927 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -494,7 +494,7 @@ class TestViews(unittest.TestCase): @patch('module_build_service.auth.get_user', return_value=user) @patch('module_build_service.scm.SCM') - @patch("module_build_service.config.Config.modules_allow_repository", + @patch("module_build_service.config.Config.modules_allow_repository", new_callable=PropertyMock, return_value=True) def test_submit_build_includedmodule(self, conf, mocked_scm, mocked_get_user): mocked_scm_obj = MockedSCM(mocked_scm, "includedmodules",