Format the coding style across the codebase using "black" and manual tweaks

The main benefit of this commit is that the use of double quotes
is now consistent.
This commit is contained in:
mprahl
2019-04-25 17:58:44 -04:00
parent 559f0dd922
commit 66c3f82160
78 changed files with 9050 additions and 7438 deletions

View File

@@ -35,20 +35,16 @@ from module_build_service.models import make_session, ModuleBuild, ComponentBuil
class TestModuleInit:
def setup_method(self, test_method):
self.fn = module_build_service.scheduler.handlers.modules.init
self.staged_data_dir = os.path.join(
os.path.dirname(__file__), '../', 'staged_data')
testmodule_yml_path = os.path.join(
self.staged_data_dir, 'testmodule_init.yaml')
with open(testmodule_yml_path, 'r') as f:
self.staged_data_dir = os.path.join(os.path.dirname(__file__), "../", "staged_data")
testmodule_yml_path = os.path.join(self.staged_data_dir, "testmodule_init.yaml")
with open(testmodule_yml_path, "r") as f:
yaml = to_text_type(f.read())
scmurl = 'git://pkgs.domain.local/modules/testmodule?#620ec77'
scmurl = "git://pkgs.domain.local/modules/testmodule?#620ec77"
clean_database()
with make_session(conf) as session:
ModuleBuild.create(
session, conf, 'testmodule', '1', 3, yaml, scmurl, 'mprahl')
ModuleBuild.create(session, conf, "testmodule", "1", 3, yaml, scmurl, "mprahl")
def teardown_method(self, test_method):
try:
@@ -57,13 +53,19 @@ class TestModuleInit:
except Exception:
pass
@patch("module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder."
"get_built_rpms_in_module_build")
@patch('module_build_service.scm.SCM')
@patch('module_build_service.scheduler.handlers.modules.handle_stream_collision_modules')
@patch(
"module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder."
"get_built_rpms_in_module_build"
)
@patch("module_build_service.scm.SCM")
@patch("module_build_service.scheduler.handlers.modules.handle_stream_collision_modules")
def test_init_basic(self, rscm, mocked_scm, built_rpms):
FakeSCM(mocked_scm, 'testmodule', 'testmodule_init.yaml',
'620ec77321b2ea7b0d67d82992dda3e1d67055b4')
FakeSCM(
mocked_scm,
"testmodule",
"testmodule_init.yaml",
"620ec77321b2ea7b0d67d82992dda3e1d67055b4",
)
built_rpms.return_value = [
"foo-0:2.4.48-3.el8+1308+551bfa71",
@@ -71,7 +73,8 @@ class TestModuleInit:
"bar-0:2.5.48-3.el8+1308+551bfa71",
"bar-debuginfo-0:2.5.48-3.el8+1308+551bfa71",
"x-0:2.5.48-3.el8+1308+551bfa71",
"x-debuginfo-0:2.5.48-3.el8+1308+551bfa71"]
"x-debuginfo-0:2.5.48-3.el8+1308+551bfa71",
]
platform_build = ModuleBuild.query.get(1)
mmd = platform_build.mmd()
@@ -83,7 +86,8 @@ class TestModuleInit:
db.session.commit()
msg = module_build_service.messaging.MBSModule(
msg_id=None, module_build_id=2, module_build_state='init')
msg_id=None, module_build_id=2, module_build_state="init"
)
with make_session(conf) as session:
self.fn(config=conf, session=session, msg=msg)
@@ -91,10 +95,12 @@ class TestModuleInit:
# Make sure the module entered the wait state
assert build.state == 1, build.state
# Make sure format_mmd was run properly
xmd_mbs = build.mmd().get_xmd()['mbs']
xmd_mbs = build.mmd().get_xmd()["mbs"]
assert type(xmd_mbs) is GLib.Variant
assert xmd_mbs["buildrequires"]["platform"]["filtered_rpms"] == [
'foo-0:2.4.48-3.el8+1308+551bfa71', 'bar-0:2.5.48-3.el8+1308+551bfa71']
"foo-0:2.4.48-3.el8+1308+551bfa71",
"bar-0:2.5.48-3.el8+1308+551bfa71",
]
return build
def test_init_called_twice(self):
@@ -113,16 +119,16 @@ class TestModuleInit:
new_mmd = yaml.safe_load(build.modulemd)
assert old_mmd == new_mmd
@patch('module_build_service.scm.SCM')
@patch("module_build_service.scm.SCM")
def test_init_scm_not_available(self, mocked_scm):
def mocked_scm_get_latest():
raise RuntimeError("Failed in mocked_scm_get_latest")
FakeSCM(mocked_scm, 'testmodule', 'testmodule.yaml',
'620ec77321b2ea7b0d67d82992dda3e1d67055b4')
FakeSCM(
mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4")
mocked_scm.return_value.get_latest = mocked_scm_get_latest
msg = module_build_service.messaging.MBSModule(
msg_id=None, module_build_id=2, module_build_state='init')
msg_id=None, module_build_id=2, module_build_state="init")
with make_session(conf) as session:
self.fn(config=conf, session=session, msg=msg)
build = ModuleBuild.query.filter_by(id=2).one()
@@ -130,51 +136,56 @@ class TestModuleInit:
# since the git server is not available
assert build.state == 4, build.state
@patch("module_build_service.config.Config.modules_allow_repository",
new_callable=PropertyMock, return_value=True)
@patch('module_build_service.scm.SCM')
@patch(
"module_build_service.config.Config.modules_allow_repository",
new_callable=PropertyMock,
return_value=True,
)
@patch("module_build_service.scm.SCM")
def test_init_includedmodule(self, mocked_scm, mocked_mod_allow_repo):
FakeSCM(mocked_scm, "includedmodules", ['testmodule_init.yaml'])
includedmodules_yml_path = os.path.join(
self.staged_data_dir, 'includedmodules.yaml')
with open(includedmodules_yml_path, 'r') as f:
FakeSCM(mocked_scm, "includedmodules", ["testmodule_init.yaml"])
includedmodules_yml_path = os.path.join(self.staged_data_dir, "includedmodules.yaml")
with open(includedmodules_yml_path, "r") as f:
yaml = to_text_type(f.read())
scmurl = 'git://pkgs.domain.local/modules/includedmodule?#da95886'
scmurl = "git://pkgs.domain.local/modules/includedmodule?#da95886"
with make_session(conf) as session:
ModuleBuild.create(
session, conf, 'includemodule', '1', 3, yaml, scmurl, 'mprahl')
ModuleBuild.create(session, conf, "includemodule", "1", 3, yaml, scmurl, "mprahl")
msg = module_build_service.messaging.MBSModule(
msg_id=None, module_build_id=3, module_build_state='init')
msg_id=None, module_build_id=3, module_build_state="init")
self.fn(config=conf, session=session, msg=msg)
build = ModuleBuild.query.filter_by(id=3).one()
assert build.state == 1
assert build.name == 'includemodule'
assert build.name == "includemodule"
batches = {}
for comp_build in ComponentBuild.query.filter_by(module_id=3).all():
batches[comp_build.package] = comp_build.batch
assert batches['perl-List-Compare'] == 2
assert batches['perl-Tangerine'] == 2
assert batches['foo'] == 2
assert batches['tangerine'] == 3
assert batches['file'] == 4
assert batches["perl-List-Compare"] == 2
assert batches["perl-Tangerine"] == 2
assert batches["foo"] == 2
assert batches["tangerine"] == 3
assert batches["file"] == 4
# Test that the RPMs are properly merged in xmd
xmd_rpms = {
'perl-List-Compare': {'ref': '4f26aeafdb'},
'perl-Tangerine': {'ref': '4f26aeafdb'},
'tangerine': {'ref': '4f26aeafdb'},
'foo': {'ref': '93dea37599'},
'file': {'ref': 'a2740663f8'},
"perl-List-Compare": {"ref": "4f26aeafdb"},
"perl-Tangerine": {"ref": "4f26aeafdb"},
"tangerine": {"ref": "4f26aeafdb"},
"foo": {"ref": "93dea37599"},
"file": {"ref": "a2740663f8"},
}
assert build.mmd().get_xmd()['mbs']['rpms'] == xmd_rpms
assert build.mmd().get_xmd()["mbs"]["rpms"] == xmd_rpms
@patch('module_build_service.models.ModuleBuild.from_module_event')
@patch('module_build_service.scm.SCM')
@patch("module_build_service.models.ModuleBuild.from_module_event")
@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)
FakeSCM(
mocked_scm,
"testmodule",
"testmodule.yaml",
"7035bd33614972ac66559ac1fdd019ff6027ad22",
get_latest_raise=True,
)
msg = module_build_service.messaging.MBSModule(
msg_id=None, module_build_id=2, module_build_state='init')
msg_id=None, module_build_id=2, module_build_state="init")
with make_session(conf) as session:
build = session.query(ModuleBuild).filter_by(id=2).one()
mocked_from_module_event.return_value = build
@@ -183,4 +194,4 @@ class TestModuleInit:
session.refresh(build)
# Make sure the module entered the failed state
assert build.state == 4, build.state
assert 'Failed to get the latest commit for' in build.state_reason
assert "Failed to get the latest commit for" in build.state_reason