diff --git a/module_build_service/utils/submit.py b/module_build_service/utils/submit.py index 8952e117..062c4f6c 100644 --- a/module_build_service/utils/submit.py +++ b/module_build_service/utils/submit.py @@ -880,7 +880,7 @@ def _process_support_streams(db_session, mmd, params): log.debug("A release date for the release %s could not be determined", pp_release) continue - if datetime.strptime(ga_date, '%Y-%m-%d').date() >= datetime.utcnow().date(): + if datetime.strptime(ga_date, "%Y-%m-%d").date() >= datetime.utcnow().date(): log.debug( "The release %s hasn't been released yet. Not adding a stream suffix.", ga_date diff --git a/tests/test_resolver/test_koji.py b/tests/test_resolver/test_koji.py index 7fe3b49f..f9d131a8 100644 --- a/tests/test_resolver/test_koji.py +++ b/tests/test_resolver/test_koji.py @@ -98,7 +98,7 @@ class TestLocalResolverModule: assert result == [] koji_session.listTagged.assert_called_with( - 'foo-test', inherit=True, package='testmodule', type='module', event=123) + "foo-test", inherit=True, package="testmodule", type="module", event=123) @patch("module_build_service.builder.KojiModuleBuilder.KojiClientSession") def test_get_buildrequired_modulemds_multiple_streams(self, ClientSession, db_session): @@ -107,12 +107,12 @@ class TestLocalResolverModule: # We will ask for testmodule:master, but there is also testmodule:2 in a tag. koji_session.listTagged.return_value = [ { - 'build_id': 123, 'name': 'testmodule', 'version': '2', - 'release': '820181219174508.9edba152', 'tag_name': 'foo-test' + "build_id": 123, "name": "testmodule", "version": "2", + "release": "820181219174508.9edba152", "tag_name": "foo-test" }, { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20170109091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20170109091357.7c29193d", "tag_name": "foo-test" }] self._create_test_modules(db_session) @@ -131,12 +131,12 @@ class TestLocalResolverModule: # ValueError later. koji_session.listTagged.return_value = [ { - 'build_id': 123, 'name': 'testmodule', 'version': '2', - 'release': '820181219174508.9edba152', 'tag_name': 'foo-test' + "build_id": 123, "name": "testmodule", "version": "2", + "release": "820181219174508.9edba152", "tag_name": "foo-test" }, { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20170109091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20170109091357.7c29193d", "tag_name": "foo-test" }] self._create_test_modules(db_session) @@ -156,20 +156,20 @@ class TestLocalResolverModule: # ValueError later. koji_session.listTagged.return_value = [ { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20160110091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20160110091357.7c29193d", "tag_name": "foo-test" }, { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20170109091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20170109091357.7c29193d", "tag_name": "foo-test" }, { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20170109091357.7c29193e', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20170109091357.7c29193e", "tag_name": "foo-test" }, { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20160109091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20160109091357.7c29193d", "tag_name": "foo-test" }] self._create_test_modules(db_session) @@ -193,16 +193,16 @@ class TestLocalResolverModule: builds = [ { - 'build_id': 124, 'name': 'testmodule', 'version': 'master', - 'release': '20170110091357.7c29193d', 'tag_name': 'foo-test' + "build_id": 124, "name": "testmodule", "version": "master", + "release": "20170110091357.7c29193d", "tag_name": "foo-test" }, { - 'build_id': 125, 'name': 'testmodule', 'version': 'master', - 'release': '20180109091357.7c29193d', 'tag_name': 'foo-test-parent' + "build_id": 125, "name": "testmodule", "version": "master", + "release": "20180109091357.7c29193d", "tag_name": "foo-test-parent" }, { - 'build_id': 126, 'name': 'testmodule', 'version': '2', - 'release': '20180109091357.7c29193d', 'tag_name': 'foo-test-parent' + "build_id": 126, "name": "testmodule", "version": "2", + "release": "20180109091357.7c29193d", "tag_name": "foo-test-parent" }] resolver = mbs_resolver.GenericResolver.create(db_session, tests.conf, backend="koji") diff --git a/tests/test_scheduler/test_default_modules.py b/tests/test_scheduler/test_default_modules.py index 0b0d4e56..5ea0e42d 100644 --- a/tests/test_scheduler/test_default_modules.py +++ b/tests/test_scheduler/test_default_modules.py @@ -138,8 +138,8 @@ def test_add_default_modules_request_failed(mock_get_dm, db_session): @pytest.mark.parametrize("is_rawhide", (True, False)) -@patch('shutil.rmtree') -@patch('tempfile.mkdtemp') +@patch("shutil.rmtree") +@patch("tempfile.mkdtemp") @patch("module_build_service.scheduler.default_modules.Modulemd.ModuleIndex.new") @patch("module_build_service.scheduler.default_modules.scm.SCM") @patch("module_build_service.scheduler.default_modules._get_rawhide_version") @@ -172,8 +172,8 @@ def test_get_default_modules( @pytest.mark.parametrize("uses_rawhide", (True, False)) -@patch('shutil.rmtree') -@patch('tempfile.mkdtemp') +@patch("shutil.rmtree") +@patch("tempfile.mkdtemp") @patch( "module_build_service.scheduler.default_modules.conf.uses_rawhide", new_callable=PropertyMock,