flake8 cleanup

Signed-off-by: Martin Curlej <mcurlej@redhat.com>

removed some noqa tags

tests/test_scheduler/test_consumer.py

@@ -23,6 +23,7 @@ from mock import patch, MagicMock
 from module_build_service.scheduler.consumer import MBSConsumer
 from module_build_service.messaging import KojiTagChange, KojiRepoChange
 
+
 class TestConsumer(unittest.TestCase):
 
     @patch('module_build_service.messaging.conf.messaging', new='fedmsg')

tests/test_scheduler/test_module_init.py

@@ -63,13 +63,13 @@ class TestModuleInit(unittest.TestCase):
         try:
             path = build_logs.path(1)
             os.remove(path)
-        except:
+        except Exception:
             pass
 
     @patch('module_build_service.scm.SCM')
     def test_init_basic(self, mocked_scm):
         FakeSCM(mocked_scm, 'testmodule', 'testmodule.yaml',
-                  '620ec77321b2ea7b0d67d82992dda3e1d67055b4')
+                '620ec77321b2ea7b0d67d82992dda3e1d67055b4')
         msg = module_build_service.messaging.MBSModule(
             msg_id=None, module_build_id=1, module_build_state='init')
         with make_session(conf) as session:
@@ -86,7 +86,7 @@ class TestModuleInit(unittest.TestCase):
             raise RuntimeError("Failed in mocked_scm_get_latest")
 
         FakeSCM(mocked_scm, 'testmodule', 'testmodule.yaml',
-                  '620ec77321b2ea7b0d67d82992dda3e1d67055b4')
+                '620ec77321b2ea7b0d67d82992dda3e1d67055b4')
         mocked_scm.return_value.get_latest = mocked_scm_get_latest
         msg = module_build_service.messaging.MBSModule(
             msg_id=None, module_build_id=1, module_build_state='init')
@@ -138,8 +138,8 @@ class TestModuleInit(unittest.TestCase):
     @patch('module_build_service.scm.SCM')
     def test_init_when_get_latest_raises(self, mocked_scm, mocked_from_module_event):
         FakeSCM(mocked_scm, 'testmodule', 'testmodule.yaml',
-                  '7035bd33614972ac66559ac1fdd019ff6027ad22',
-                  get_latest_raise=True)
+                '7035bd33614972ac66559ac1fdd019ff6027ad22',
+                get_latest_raise=True)
         msg = module_build_service.messaging.MBSModule(
             msg_id=None, module_build_id=1, module_build_state='init')
         with make_session(conf) as session:

tests/test_scheduler/test_module_wait.py

@@ -53,7 +53,7 @@ class TestModuleWait(unittest.TestCase):
         try:
             path = build_logs.path(1)
             os.remove(path)
-        except:
+        except Exception:
             pass
 
     @mock.patch('module_build_service.builder.GenericBuilder.create_from_module')
@@ -110,7 +110,8 @@ class TestModuleWait(unittest.TestCase):
             builder.koji_session = koji_session
             builder.module_build_tag = {"name": "module-123-build"}
             builder.get_disttag_srpm.return_value = 'some srpm disttag'
-            builder.build.return_value = 1234, koji.BUILD_STATES['COMPLETE'], "", "module-build-macros-1-1"
+            builder.build.return_value = (1234, koji.BUILD_STATES['COMPLETE'], "",
+                                          "module-build-macros-1-1")
             create_builder.return_value = builder
 
             msg = module_build_service.messaging.MBSModule(msg_id=None, module_build_id=1,
@@ -146,7 +147,8 @@ class TestModuleWait(unittest.TestCase):
             builder.koji_session = koji_session
             builder.module_build_tag = {"name": "module-123-build"}
             builder.get_disttag_srpm.return_value = 'some srpm disttag'
-            builder.build.return_value = 1234, koji.BUILD_STATES['BUILDING'], "", "module-build-macros-1-1"
+            builder.build.return_value = (1234, koji.BUILD_STATES['BUILDING'], "",
+                                          "module-build-macros-1-1")
             create_builder.return_value = builder
 
             msg = module_build_service.messaging.MBSModule(msg_id=None, module_build_id=1,
@@ -182,7 +184,8 @@ class TestModuleWait(unittest.TestCase):
             builder.koji_session = koji_session
             builder.module_build_tag = {"name": "module-123-build"}
             builder.get_disttag_srpm.return_value = 'some srpm disttag'
-            builder.build.return_value = 1234, koji.BUILD_STATES['BUILDING'], "", "module-build-macros-1-1"
+            builder.build.return_value = (1234, koji.BUILD_STATES['BUILDING'], "",
+                                          "module-build-macros-1-1")
             create_builder.return_value = builder
 
             msg = module_build_service.messaging.MBSModule(msg_id=None, module_build_id=1,
@@ -192,7 +195,6 @@ class TestModuleWait(unittest.TestCase):
             module_build = ModuleBuild.query.filter_by(id=1).one()
             self.assertEqual(module_build.cg_build_koji_tag, "modular-updates-candidate")
 
-
     @patch("module_build_service.builder.GenericBuilder.default_buildroot_groups",
            return_value={'build': [], 'srpm-build': []})
     @patch("module_build_service.builder.KojiModuleBuilder.get_session")
@@ -222,7 +224,8 @@ class TestModuleWait(unittest.TestCase):
             builder.koji_session = koji_session
             builder.module_build_tag = {"name": "module-123-build"}
             builder.get_disttag_srpm.return_value = 'some srpm disttag'
-            builder.build.return_value = 1234, koji.BUILD_STATES['BUILDING'], "", "module-build-macros-1-1"
+            builder.build.return_value = (1234, koji.BUILD_STATES['BUILDING'], "",
+                                          "module-build-macros-1-1")
             create_builder.return_value = builder
 
             msg = module_build_service.messaging.MBSModule(msg_id=None, module_build_id=1,

tests/test_scheduler/test_poller.py

@@ -258,8 +258,8 @@ class TestPoller(unittest.TestCase):
             if state_name in ["done", "ready", "failed"]:
                 koji_session.deleteBuildTarget.assert_called_once_with(852)
 
-    def test_process_waiting_module_build(
-        self, create_builder, koji_get_session, global_consumer, dbg):
+    def test_process_waiting_module_build(self, create_builder, koji_get_session,
+                                          global_consumer, dbg):
         """ Test that processing old waiting module builds works. """
 
         consumer = mock.MagicMock()
@@ -289,9 +289,8 @@ class TestPoller(unittest.TestCase):
         # ensure the time_modified was changed.
         self.assertGreater(module_build.time_modified, original)
 
-
-    def test_process_waiting_module_build_not_old_enough(
-        self, create_builder, koji_get_session, global_consumer, dbg):
+    def test_process_waiting_module_build_not_old_enough(self, create_builder, koji_get_session,
+                                                         global_consumer, dbg):
         """ Test that we do not process young waiting builds. """
 
         consumer = mock.MagicMock()
@@ -319,8 +318,8 @@ class TestPoller(unittest.TestCase):
         # Ensure we did *not* process the 9 minute-old build.
         self.assertEquals(consumer.incoming.qsize(), 0)
 
-    def test_process_waiting_module_build_none_found(
-        self, create_builder, koji_get_session, global_consumer, dbg):
+    def test_process_waiting_module_build_none_found(self, create_builder, koji_get_session,
+                                                     global_consumer, dbg):
         """ Test nothing happens when no module builds are waiting. """
 
         consumer = mock.MagicMock()

tests/test_scheduler/test_repo_done.py

@@ -60,7 +60,8 @@ class TestRepoDone(unittest.TestCase):
 
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_average_build_time',
                 return_value=0.0)
-    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components', return_value=[])
+    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components',
+                return_value=[])
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready', return_value=True)
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_session')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.build')
@@ -77,11 +78,13 @@ class TestRepoDone(unittest.TestCase):
             config=conf, session=db.session, msg=msg)
         build_fn.assert_called_once_with(
             artifact_name='communicator',
-            source='git://pkgs.domain.local/rpms/communicator?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2')
+            source=('git://pkgs.domain.local/rpms/communicator'
+                    '?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2'))
 
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_average_build_time',
                 return_value=0.0)
-    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components', return_value=[])
+    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components',
+                return_value=[])
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready', return_value=True)
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_session')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.build')
@@ -100,18 +103,21 @@ class TestRepoDone(unittest.TestCase):
             config=conf, session=db.session, msg=msg)
         build_fn.assert_called_once_with(
             artifact_name='communicator',
-            source='git://pkgs.domain.local/rpms/communicator?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2')
+            source=('git://pkgs.domain.local/rpms/communicator'
+                    '?#da95886c8a443b36a9ce31abda1f9bed22f2f9c2'))
         component_build = module_build_service.models.ComponentBuild.query\
             .filter_by(package='communicator').one()
         self.assertEquals(component_build.state_reason,
                           'Failed to submit artifact communicator to Koji')
 
-    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components', return_value=[])
+    @mock.patch('module_build_service.builder.KojiModuleBuilder.list_tasks_for_components',
+                return_value=[])
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_ready', return_value=True)
     @mock.patch('module_build_service.builder.KojiModuleBuilder.get_session')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.build')
     @mock.patch('module_build_service.builder.KojiModuleBuilder.buildroot_connect')
-    @mock.patch("module_build_service.builder.GenericBuilder.default_buildroot_groups", return_value={'build': [], 'srpm-build': []})
+    @mock.patch("module_build_service.builder.GenericBuilder.default_buildroot_groups",
+                return_value={'build': [], 'srpm-build': []})
     def test_failed_component_build(self, dbg, connect, build_fn, config, ready, list_tasks_fn):
         """ Test that when a KojiModuleBuilder.build fails, the build is
         marked as failed with proper state_reason.
@@ -128,4 +134,5 @@ class TestRepoDone(unittest.TestCase):
             module_build = module_build_service.models.ModuleBuild.query\
                 .filter_by(name='starcommand').one()
 
-            self.assertEquals(module_build.state, module_build_service.models.BUILD_STATES["failed"])
+            self.assertEquals(module_build.state,
+                              module_build_service.models.BUILD_STATES["failed"])

tests/test_scheduler/test_tag_tagged.py

@@ -322,7 +322,6 @@ class TestTagTagged(unittest.TestCase):
         # status later in poller.
         self.assertEqual(module_build.new_repo_task_id, 123456)
 
-
     @patch("module_build_service.builder.GenericBuilder.default_buildroot_groups",
            return_value={'build': [], 'srpm-build': []})
     @patch("module_build_service.builder.KojiModuleBuilder.get_session")