Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

enforce E501 in test/ (MR 2058)

Browse source
This commit is contained in:
Caio Fontes 2021-05-19 16:43:36 -03:00 • committed by Oliver Smith
parent f3b3fe906b
commit 27746db188
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
8 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/test_aportgen_device_wizard.py
View file

@ -37,7 +37,8 @@ def args(tmpdir, request):
# Copy the linux-lg-mako aport (we currently copy patches from there)
pmb.helpers.run.user(args, ["mkdir", "-p", tmpdir + "/device/testing"])
path_mako = args._aports_real + "/device/testing/linux-lg-mako"
pmb.helpers.run.user(args, ["cp", "-r", path_mako, tmpdir + "/device/testing"])
pmb.helpers.run.user(args, ["cp", "-r", path_mako,
f"{tmpdir}/device/testing"])
# Copy pmaports.cfg
shutil.copy(f"{pmb_test.const.testdata}/pmaports.cfg", args.aports)
@ -46,7 +47,8 @@ def args(tmpdir, request):
def generate(args, monkeypatch, answers):
"""
Generate the device-new-device and linux-new-device aports (with a patched pmb.helpers.cli()).
Generate the device-new-device and linux-new-device aports (with a patched
pmb.helpers.cli()).
:returns: (deviceinfo, apkbuild, apkbuild_linux) - the parsed dictionaries
of the created files, as returned by pmb.parse.apkbuild() and
@ -69,12 +71,13 @@ def generate(args, monkeypatch, answers):
pmb.aportgen.generate(args, "linux-testsuite-testdevice")
monkeypatch.undo()
apkbuild_path = (args.aports + "/device/testing/device-testsuite-testdevice/"
"APKBUILD")
apkbuild_path = (f"{args.aports}/device/testing/"
"device-testsuite-testdevice/APKBUILD")
apkbuild_path_linux = (args.aports + "/device/testing/"
"linux-testsuite-testdevice/APKBUILD")
# The build fails if the email is not a valid email, so remove them just for tests
# The build fails if the email is not a valid email, so remove them just
# for tests
remove_contributor_maintainer_lines(args, apkbuild_path)
remove_contributor_maintainer_lines(args, apkbuild_path_linux)