From 8fecbd6216eebeba17d4792197882266c4765677 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Oct 03 2017 08:28:46 +0000 Subject: Fix flak8 issues --- diff --git a/freshmaker/config.py b/freshmaker/config.py index e9a9206..6c940fb 100644 --- a/freshmaker/config.py +++ b/freshmaker/config.py @@ -229,7 +229,7 @@ class Config(object): 'type': str, 'default': 'RHEL-7', 'desc': 'When set, only builds based on this RHEL release ' - 'will be included in rebuilds.'}, + 'will be included in rebuilds.'}, 'pulp_server_url': { 'type': str, 'default': '', diff --git a/freshmaker/errata.py b/freshmaker/errata.py index 492c62d..afbbc83 100644 --- a/freshmaker/errata.py +++ b/freshmaker/errata.py @@ -59,7 +59,7 @@ class Errata(object): # something for particular product version, its rhel_release version # should not change. product_region = dogpile.cache.make_region().configure( - conf.dogpile_cache_backend, expiration_time=24*3600) + conf.dogpile_cache_backend, expiration_time=24 * 3600) def __init__(self, server_url): """ @@ -230,7 +230,7 @@ class Errata(object): errata_id, product_version) Errata.product_region.set(product_version, rhel_release) - if (rhel_release_prefix and + if (rhel_release_prefix and not rhel_release.startswith(rhel_release_prefix)): log.info("Skipping builds for %s - not based on RHEL %s", product_version, rhel_release_prefix) diff --git a/freshmaker/lightblue.py b/freshmaker/lightblue.py index 6218814..b71c155 100644 --- a/freshmaker/lightblue.py +++ b/freshmaker/lightblue.py @@ -88,10 +88,12 @@ class LightBlueRequestError(LightBlueError): for err in self.raw['errors'])) ) + class KojiLookupError(ValueError): """ Koji lookup error """ pass + class ContainerRepository(dict): """Represent a container repository""" @@ -118,7 +120,7 @@ class ContainerImage(dict): def _get_default_additional_data(self): return {"repository": None, "commit": None, "target": None, - "git_branch": None, "error": None} + "git_branch": None, "error": None} @region.cache_on_arguments() def _get_additional_data_from_koji(self, nvr): diff --git a/tests/test_errata.py b/tests/test_errata.py index cfd5242..53fba65 100644 --- a/tests/test_errata.py +++ b/tests/test_errata.py @@ -74,19 +74,19 @@ class MockedErrataAPI(object): "advisory_name": "RHSA-2017:28484", "status": "QE", "security_impact": "Important", - "product" : { + "product": { "id": 89 - } } + } self.product_versions_json = [ - {"product_version": {"name": "PRODUCT1-3.0-NFS", "id": 1}}, - {"product_version": {"name": "PRODUCT1-3.1-NFS", "id": 2}}, - {"product_version": {"name": "PRODUCT1-3.2-NFS", "id": 3}}, - {"product_version": {"name": "PRODUCT1", "id": 3}}, - {"product_version": {"name": "PRODUCT2-3.2-NFS", "id": 4}}, - {"product_version": {"name": "PRODUCT2", "id": 4}}, - ] + {"product_version": {"name": "PRODUCT1-3.0-NFS", "id": 1}}, + {"product_version": {"name": "PRODUCT1-3.1-NFS", "id": 2}}, + {"product_version": {"name": "PRODUCT1-3.2-NFS", "id": 3}}, + {"product_version": {"name": "PRODUCT1", "id": 3}}, + {"product_version": {"name": "PRODUCT2-3.2-NFS", "id": 4}}, + {"product_version": {"name": "PRODUCT2", "id": 4}}, + ] self.product_versions = {} self.product_versions[3] = {"rhel_release": {"name": "RHEL-6-foobar"}} @@ -108,7 +108,7 @@ class MockedErrataAPI(object): elif endpoint.find("/product_versions/") != -1: id = int(endpoint.split("/")[-1].replace(".json", "")) return self.product_versions[id] - + class TestErrata(unittest.TestCase): def setUp(self): @@ -193,7 +193,7 @@ class TestErrata(unittest.TestCase): @patch.object(Errata, "_errata_http_get") def test_rhel_release_from_product_version( self, errata_http_get, errata_rest_get): - mocked_errata = MockedErrataAPI(errata_rest_get, errata_http_get) + MockedErrataAPI(errata_rest_get, errata_http_get) ret = self.errata._rhel_release_from_product_version( 28484, "PRODUCT1-3.2-NFS") self.assertEqual(ret, "RHEL-6-foobar") @@ -202,16 +202,16 @@ class TestErrata(unittest.TestCase): @patch.object(Errata, "_errata_http_get") def test_rhel_release_from_product_version_unknown_product_ver( self, errata_http_get, errata_rest_get): - mocked_errata = MockedErrataAPI(errata_rest_get, errata_http_get) + MockedErrataAPI(errata_rest_get, errata_http_get) with self.assertRaises(ValueError): - ret = self.errata._rhel_release_from_product_version( + self.errata._rhel_release_from_product_version( 28484, "PRODUCT1-2.9-NFS") @patch.object(Errata, "_errata_rest_get") @patch.object(Errata, "_errata_http_get") def test_get_builds( self, errata_http_get, errata_rest_get): - mocked_errata = MockedErrataAPI(errata_rest_get, errata_http_get) + MockedErrataAPI(errata_rest_get, errata_http_get) ret = self.errata.get_builds(28484, "") self.assertEqual(ret, set(['libntirpc-1.4.3-4.el7rhgs', 'libntirpc-1.4.3-4.el6rhs'])) @@ -220,7 +220,6 @@ class TestErrata(unittest.TestCase): @patch.object(Errata, "_errata_http_get") def test_get_builds_rhel_7( self, errata_http_get, errata_rest_get): - mocked_errata = MockedErrataAPI(errata_rest_get, errata_http_get) + MockedErrataAPI(errata_rest_get, errata_http_get) ret = self.errata.get_builds(28484, "RHEL-7") self.assertEqual(ret, set(['libntirpc-1.4.3-4.el7rhgs'])) -