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

args.logfd: remove (MR 2114)

Browse source 
Replace "args.logfd" with "pmb.helpers.logging.logfd" in order to avoid
passing "args" to all functions that only use it to write to logfd. This
is the first step to get rid of this args-passed-to-all-functions
pattern in pmbootstrap.
This commit is contained in:
BO41 2021-09-20 12:00:13 +02:00 • committed by Oliver Smith
parent 313c9611c8
commit 944f539dd6
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
43 changed files with 119 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

46
pmb/aportgen/device.py
View file

@ -9,13 +9,13 @@ import pmb.parse.apkindex
import pmb.parse.bootimg import pmb.parse.bootimg
def ask_for_architecture(args): def ask_for_architecture():
architectures = pmb.config.build_device_architectures architectures = pmb.config.build_device_architectures
# Don't show armhf, new ports shouldn't use this architecture # Don't show armhf, new ports shouldn't use this architecture
if "armhf" in architectures: if "armhf" in architectures:
architectures.remove("armhf") architectures.remove("armhf")
while True: while True:
ret = pmb.helpers.cli.ask(args, "Device architecture", architectures, ret = pmb.helpers.cli.ask("Device architecture", architectures,
architectures[0], complete=architectures) architectures[0], complete=architectures)
if ret in architectures: if ret in architectures:
return ret return ret
@ -25,14 +25,14 @@ def ask_for_architecture(args):
" pmb/config/__init__.py.") " pmb/config/__init__.py.")
def ask_for_manufacturer(args): def ask_for_manufacturer():
logging.info("Who produced the device (e.g. LG)?") logging.info("Who produced the device (e.g. LG)?")
return pmb.helpers.cli.ask(args, "Manufacturer", None, None, False) return pmb.helpers.cli.ask("Manufacturer", None, None, False)
def ask_for_name(args, manufacturer): def ask_for_name(manufacturer):
logging.info("What is the official name (e.g. Google Nexus 5)?") logging.info("What is the official name (e.g. Google Nexus 5)?")
ret = pmb.helpers.cli.ask(args, "Name", None, None, False) ret = pmb.helpers.cli.ask("Name", None, None, False)
# Always add the manufacturer # Always add the manufacturer
if not ret.startswith(manufacturer) and \ if not ret.startswith(manufacturer) and \
@ -41,19 +41,19 @@ def ask_for_name(args, manufacturer):
return ret return ret
def ask_for_year(args): def ask_for_year():
# Regex from https://stackoverflow.com/a/12240826 # Regex from https://stackoverflow.com/a/12240826
logging.info("In what year was the device released (e.g. 2012)?") logging.info("In what year was the device released (e.g. 2012)?")
return pmb.helpers.cli.ask(args, "Year", None, None, False, return pmb.helpers.cli.ask("Year", None, None, False,
validation_regex=r'^[1-9]\d{3,}$') validation_regex=r'^[1-9]\d{3,}$')
def ask_for_chassis(args): def ask_for_chassis():
types = pmb.config.deviceinfo_chassis_types types = pmb.config.deviceinfo_chassis_types
logging.info("What type of device is it?") logging.info("What type of device is it?")
logging.info("Valid types are: " + ", ".join(types)) logging.info("Valid types are: " + ", ".join(types))
return pmb.helpers.cli.ask(args, "Chassis", None, None, True, return pmb.helpers.cli.ask("Chassis", None, None, True,
validation_regex='|'.join(types), validation_regex='|'.join(types),
complete=types) complete=types)
@ -68,10 +68,10 @@ def ask_for_external_storage(args):
" other external storage medium?") " other external storage medium?")
def ask_for_flash_method(args): def ask_for_flash_method():
while True: while True:
logging.info("Which flash method does the device support?") logging.info("Which flash method does the device support?")
method = pmb.helpers.cli.ask(args, "Flash method", method = pmb.helpers.cli.ask("Flash method",
pmb.config.flash_methods, pmb.config.flash_methods,
pmb.config.flash_methods[0]) pmb.config.flash_methods[0])
@ -84,7 +84,7 @@ def ask_for_flash_method(args):
logging.info("<https://wiki.postmarketos.org/wiki" logging.info("<https://wiki.postmarketos.org/wiki"
"/Deviceinfo_flash_methods#Isorec_or_bootimg" "/Deviceinfo_flash_methods#Isorec_or_bootimg"
".3F>") ".3F>")
heimdall_type = pmb.helpers.cli.ask(args, "Type", heimdall_type = pmb.helpers.cli.ask("Type",
heimdall_types, heimdall_types,
heimdall_types[0]) heimdall_types[0])
if heimdall_type in heimdall_types: if heimdall_type in heimdall_types:
@ -106,7 +106,7 @@ def ask_for_bootimg(args):
" 'pmbootstrap bootimg_analyze').") " 'pmbootstrap bootimg_analyze').")
while True: while True:
response = pmb.helpers.cli.ask(args, "Path", None, "", False) response = pmb.helpers.cli.ask("Path", None, "", False)
path = os.path.expanduser(response) path = os.path.expanduser(response)
if not path: if not path:
return None return None
@ -116,7 +116,7 @@ def ask_for_bootimg(args):
logging.fatal("ERROR: " + str(e) + ". Please try again.") logging.fatal("ERROR: " + str(e) + ". Please try again.")
def generate_deviceinfo_fastboot_content(args, bootimg=None): def generate_deviceinfo_fastboot_content(bootimg=None):
if bootimg is None: if bootimg is None:
bootimg = {"cmdline": "", bootimg = {"cmdline": "",
"qcdt": "false", "qcdt": "false",
@ -205,9 +205,9 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, year, arch,
""" """
if flash_method == "fastboot": if flash_method == "fastboot":
content += generate_deviceinfo_fastboot_content(args, bootimg) content += generate_deviceinfo_fastboot_content(bootimg)
elif flash_method == "heimdall-bootimg": elif flash_method == "heimdall-bootimg":
content += generate_deviceinfo_fastboot_content(args, bootimg) content += generate_deviceinfo_fastboot_content(bootimg)
content += content_heimdall_bootimg content += content_heimdall_bootimg
elif flash_method == "heimdall-isorec": elif flash_method == "heimdall-isorec":
content += content_heimdall_isorec content += content_heimdall_isorec
@ -273,14 +273,14 @@ def generate_apkbuild(args, pkgname, name, arch, flash_method):
def generate(args, pkgname): def generate(args, pkgname):
arch = ask_for_architecture(args) arch = ask_for_architecture()
manufacturer = ask_for_manufacturer(args) manufacturer = ask_for_manufacturer()
name = ask_for_name(args, manufacturer) name = ask_for_name(manufacturer)
year = ask_for_year(args) year = ask_for_year()
chassis = ask_for_chassis(args) chassis = ask_for_chassis()
has_keyboard = ask_for_keyboard(args) has_keyboard = ask_for_keyboard(args)
has_external_storage = ask_for_external_storage(args) has_external_storage = ask_for_external_storage(args)
flash_method = ask_for_flash_method(args) flash_method = ask_for_flash_method()
bootimg = None bootimg = None
if flash_method in ["fastboot", "heimdall-bootimg"]: if flash_method in ["fastboot", "heimdall-bootimg"]:
bootimg = ask_for_bootimg(args) bootimg = ask_for_bootimg(args)

2
pmb/aportgen/linux.py
View file

@ -26,7 +26,7 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
build += """\n build += """\n
# Master DTB (deviceinfo_bootimg_qcdt)""" # Master DTB (deviceinfo_bootimg_qcdt)"""
vendors = ["spreadtrum", "exynos", "other"] vendors = ["spreadtrum", "exynos", "other"]
soc_vendor = pmb.helpers.cli.ask(args, "SoC vendor", vendors, soc_vendor = pmb.helpers.cli.ask("SoC vendor", vendors,
vendors[-1], complete=vendors) vendors[-1], complete=vendors)
if soc_vendor == "spreadtrum": if soc_vendor == "spreadtrum":
makedepends.append("dtbtool-sprd") makedepends.append("dtbtool-sprd")

33
pmb/config/init.py
View file

@ -47,7 +47,7 @@ def ask_for_work_path(args):
while True: while True:
try: try:
work = os.path.expanduser(pmb.helpers.cli.ask( work = os.path.expanduser(pmb.helpers.cli.ask(
args, "Work path", None, args.work, False)) "Work path", None, args.work, False))
work = os.path.realpath(work) work = os.path.realpath(work)
exists = os.path.exists(work) exists = os.path.exists(work)
@ -103,7 +103,7 @@ def ask_for_channel(args):
# Ask until user gives valid channel # Ask until user gives valid channel
while True: while True:
ret = pmb.helpers.cli.ask(args, "Channel", None, default, ret = pmb.helpers.cli.ask("Channel", None, default,
complete=choices) complete=choices)
if ret in choices: if ret in choices:
return ret return ret
@ -138,7 +138,7 @@ def ask_for_ui(args, device):
" available. See: <https://wiki.postmarketos.org/wiki/" " available. See: <https://wiki.postmarketos.org/wiki/"
"Deviceinfo_reference") "Deviceinfo_reference")
while True: while True:
ret = pmb.helpers.cli.ask(args, "User interface", None, args.ui, True, ret = pmb.helpers.cli.ask("User interface", None, args.ui, True,
complete=ui_completion_list) complete=ui_completion_list)
if ret in dict(ui_list).keys(): if ret in dict(ui_list).keys():
return ret return ret
@ -174,7 +174,7 @@ def ask_for_keymaps(args, device):
args.keymap = options[0] args.keymap = options[0]
while True: while True:
ret = pmb.helpers.cli.ask(args, "Keymap", None, args.keymap, ret = pmb.helpers.cli.ask("Keymap", None, args.keymap,
True, complete=options) True, complete=options)
if ret in options: if ret in options:
return ret return ret
@ -241,7 +241,7 @@ def ask_for_device_kernel(args, device):
for type in sorted(kernels.keys()): for type in sorted(kernels.keys()):
logging.info(f"* {type}: {kernels[type]}") logging.info(f"* {type}: {kernels[type]}")
while True: while True:
ret = pmb.helpers.cli.ask(args, "Kernel", None, default, True, ret = pmb.helpers.cli.ask("Kernel", None, default, True,
complete=kernels) complete=kernels)
if ret in kernels.keys(): if ret in kernels.keys():
return ret return ret
@ -310,7 +310,7 @@ def ask_for_device(args):
current_codename = args.device.split("-", 1)[1] current_codename = args.device.split("-", 1)[1]
while True: while True:
vendor = pmb.helpers.cli.ask(args, "Vendor", None, current_vendor, vendor = pmb.helpers.cli.ask("Vendor", None, current_vendor,
False, r"[a-z0-9]+", vendors) False, r"[a-z0-9]+", vendors)
new_vendor = vendor not in vendors new_vendor = vendor not in vendors
@ -332,7 +332,7 @@ def ask_for_device(args):
if current_vendor != vendor: if current_vendor != vendor:
current_codename = '' current_codename = ''
codename = pmb.helpers.cli.ask(args, "Device codename", None, codename = pmb.helpers.cli.ask("Device codename", None,
current_codename, False, r"[a-z0-9]+", current_codename, False, r"[a-z0-9]+",
codenames) codenames)
@ -390,20 +390,20 @@ def ask_for_additional_options(args, cfg):
" enough to fit the rootfs (pmbootstrap#1904)." " enough to fit the rootfs (pmbootstrap#1904)."
" How much extra free space do you want to add to the image" " How much extra free space do you want to add to the image"
" (in MB)?") " (in MB)?")
answer = pmb.helpers.cli.ask(args, "Extra space size", None, answer = pmb.helpers.cli.ask("Extra space size", None,
args.extra_space, validation_regex="^[0-9]+$") args.extra_space, validation_regex="^[0-9]+$")
cfg["pmbootstrap"]["extra_space"] = answer cfg["pmbootstrap"]["extra_space"] = answer
# Boot size # Boot size
logging.info("What should be the boot partition size (in MB)?") logging.info("What should be the boot partition size (in MB)?")
answer = pmb.helpers.cli.ask(args, "Boot size", None, args.boot_size, answer = pmb.helpers.cli.ask("Boot size", None, args.boot_size,
validation_regex="^[1-9][0-9]*$") validation_regex="^[1-9][0-9]*$")
cfg["pmbootstrap"]["boot_size"] = answer cfg["pmbootstrap"]["boot_size"] = answer
# Parallel job count # Parallel job count
logging.info("How many jobs should run parallel on this machine, when" logging.info("How many jobs should run parallel on this machine, when"
" compiling?") " compiling?")
answer = pmb.helpers.cli.ask(args, "Jobs", None, args.jobs, answer = pmb.helpers.cli.ask("Jobs", None, args.jobs,
validation_regex="^[1-9][0-9]*$") validation_regex="^[1-9][0-9]*$")
cfg["pmbootstrap"]["jobs"] = answer cfg["pmbootstrap"]["jobs"] = answer
@ -414,7 +414,7 @@ def ask_for_additional_options(args, cfg):
" current usage with 'pmbootstrap stats'. Answer with 0 for" " current usage with 'pmbootstrap stats'. Answer with 0 for"
" infinite.") " infinite.")
regex = "0|[0-9]+(k|M|G|T|Ki|Mi|Gi|Ti)" regex = "0|[0-9]+(k|M|G|T|Ki|Mi|Gi|Ti)"
answer = pmb.helpers.cli.ask(args, "Ccache size", None, args.ccache_size, answer = pmb.helpers.cli.ask("Ccache size", None, args.ccache_size,
lowercase_answer=False, lowercase_answer=False,
validation_regex=regex) validation_regex=regex)
cfg["pmbootstrap"]["ccache_size"] = answer cfg["pmbootstrap"]["ccache_size"] = answer
@ -483,7 +483,7 @@ def ask_for_mirror(args):
mirrors_list = [] mirrors_list = []
# require one valid mirror index selected by user # require one valid mirror index selected by user
while len(mirrors_list) != 1: while len(mirrors_list) != 1:
answer = pmb.helpers.cli.ask(args, "Select a mirror", None, answer = pmb.helpers.cli.ask("Select a mirror", None,
",".join(mirror_indexes), ",".join(mirror_indexes),
validation_regex=regex) validation_regex=regex)
mirrors_list = [] mirrors_list = []
@ -499,8 +499,7 @@ def ask_for_mirror(args):
def ask_for_hostname(args, device): def ask_for_hostname(args, device):
while True: while True:
ret = pmb.helpers.cli.ask(args, ret = pmb.helpers.cli.ask("Device hostname (short form, e.g. 'foo')",
"Device hostname (short form, e.g. 'foo')",
None, (args.hostname or device), True) None, (args.hostname or device), True)
if not pmb.helpers.other.validate_hostname(ret): if not pmb.helpers.other.validate_hostname(ret):
continue continue
@ -531,7 +530,7 @@ def ask_build_pkgs_on_install(args):
def ask_for_locale(args): def ask_for_locale(args):
locales = pmb.config.locales locales = pmb.config.locales
logging.info(f"Available locales ({len(locales)}): {', '.join(locales)}") logging.info(f"Available locales ({len(locales)}): {', '.join(locales)}")
return pmb.helpers.cli.ask(args, "Choose default locale for installation", return pmb.helpers.cli.ask("Choose default locale for installation",
choices=None, choices=None,
default=args.locale, default=args.locale,
lowercase_answer=False, lowercase_answer=False,
@ -574,7 +573,7 @@ def frontend(args):
cfg["pmbootstrap"]["keymap"] = ask_for_keymaps(args, device) cfg["pmbootstrap"]["keymap"] = ask_for_keymaps(args, device)
# Username # Username
cfg["pmbootstrap"]["user"] = pmb.helpers.cli.ask(args, "Username", None, cfg["pmbootstrap"]["user"] = pmb.helpers.cli.ask("Username", None,
args.user, False, args.user, False,
"[a-z_][a-z0-9_-]*") "[a-z_][a-z0-9_-]*")
# UI and various build options # UI and various build options
@ -587,7 +586,7 @@ def frontend(args):
logging.info("Additional packages that will be installed to rootfs." logging.info("Additional packages that will be installed to rootfs."
" Specify them in a comma separated list (e.g.: vim,file)" " Specify them in a comma separated list (e.g.: vim,file)"
" or \"none\"") " or \"none\"")
extra = pmb.helpers.cli.ask(args, "Extra packages", None, extra = pmb.helpers.cli.ask("Extra packages", None,
args.extra_packages, args.extra_packages,
validation_regex=r"^([-.+\w]+)(,[-.+\w]+)*$") validation_regex=r"^([-.+\w]+)(,[-.+\w]+)*$")
cfg["pmbootstrap"]["extra_packages"] = extra cfg["pmbootstrap"]["extra_packages"] = extra

2
pmb/helpers/args.py
View file

@ -177,9 +177,7 @@ def update_work(args, work):
args_new = copy.deepcopy(args.from_argparse) args_new = copy.deepcopy(args.from_argparse)
# Keep from the modified args: # Keep from the modified args:
# * the old log file descriptor (so we can close it)
# * the unmodified args from argparse (to check if --aports was specified) # * the unmodified args from argparse (to check if --aports was specified)
args_new.logfd = args.logfd
args_new.from_argparse = args.from_argparse args_new.from_argparse = args.from_argparse
# Generate modified args again, replacing $WORK with the new work folder # Generate modified args again, replacing $WORK with the new work folder

8
pmb/helpers/cli.py
View file

@ -38,7 +38,7 @@ class ReadlineTabCompleter:
return None return None
def ask(args, question="Continue?", choices=["y", "n"], default="n", def ask(question="Continue?", choices=["y", "n"], default="n",
lowercase_answer=True, validation_regex=None, complete=None): lowercase_answer=True, validation_regex=None, complete=None):
""" """
Ask a question on the terminal. Ask a question on the terminal.
@ -83,8 +83,8 @@ def ask(args, question="Continue?", choices=["y", "n"], default="n",
if ret == "": if ret == "":
ret = str(default) ret = str(default)
args.logfd.write(f"{line}: {ret}\n") pmb.helpers.logging.logfd.write(f"{line}: {ret}\n")
args.logfd.flush() pmb.helpers.logging.logfd.flush()
# Validate with regex # Validate with regex
if not validation_regex: if not validation_regex:
@ -110,7 +110,7 @@ def confirm(args, question="Continue?", default=False, no_assumptions=False):
if args.assume_yes and not no_assumptions: if args.assume_yes and not no_assumptions:
logging.info(question + " (y/n) [" + default_str + "]: y") logging.info(question + " (y/n) [" + default_str + "]: y")
return True return True
answer = ask(args, question, ["y", "n"], default_str, True, "(y|n)") answer = ask(question, ["y", "n"], default_str, True, "(y|n)")
return answer == "y" return answer == "y"

2
pmb/helpers/frontend.py
View file

@ -551,7 +551,7 @@ def bootimg_analyze(args):
bootimg = pmb.parse.bootimg(args, args.path) bootimg = pmb.parse.bootimg(args, args.path)
tmp_output = "Put these variables in the deviceinfo file of your device:\n" tmp_output = "Put these variables in the deviceinfo file of your device:\n"
for line in pmb.aportgen.device.\ for line in pmb.aportgen.device.\
generate_deviceinfo_fastboot_content(args, bootimg).split("\n"): generate_deviceinfo_fastboot_content(bootimg).split("\n"):
tmp_output += "\n" + line.lstrip() tmp_output += "\n" + line.lstrip()
logging.info(tmp_output) logging.info(tmp_output)

17
pmb/helpers/logging.py
View file

@ -5,6 +5,8 @@ import os
import sys import sys
import pmb.config import pmb.config
logfd = None
class log_handler(logging.StreamHandler): class log_handler(logging.StreamHandler):
""" """
@ -53,8 +55,8 @@ class log_handler(logging.StreamHandler):
# Everything: Write to logfd # Everything: Write to logfd
msg = "(" + str(os.getpid()).zfill(6) + ") " + msg msg = "(" + str(os.getpid()).zfill(6) + ") " + msg
self._args.logfd.write(msg + "\n") logfd.write(msg + "\n")
self._args.logfd.flush() logfd.flush()
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
@ -83,23 +85,24 @@ def add_verbose_log_level():
def init(args): def init(args):
""" """
Set log format and add the log file descriptor to args.logfd, add the Set log format and add the log file descriptor to logfd, add the
verbose log level. verbose log level.
""" """
global logfd
# Set log file descriptor (logfd) # Set log file descriptor (logfd)
if args.details_to_stdout: if args.details_to_stdout:
setattr(args, "logfd", sys.stdout) logfd = sys.stdout
else: else:
# Require containing directory to exist (so we don't create the work # Require containing directory to exist (so we don't create the work
# folder and break the folder migration logic, which needs to set the # folder and break the folder migration logic, which needs to set the
# version upon creation) # version upon creation)
dir = os.path.dirname(args.log) dir = os.path.dirname(args.log)
if os.path.exists(dir): if os.path.exists(dir):
setattr(args, "logfd", open(args.log, "a+")) logfd = open(args.log, "a+")
else: else:
setattr(args, "logfd", open(os.devnull, "a+")) logfd = open(os.devnull, "a+")
if args.action != "init": if args.action != "init":
print("WARNING: Can't create log file in '" + dir + "', path" print(f"WARNING: Can't create log file in '{dir}', path"
" does not exist!") " does not exist!")
# Set log format # Set log format

26
pmb/helpers/run_core.py
View file

@ -35,23 +35,23 @@ def sanity_checks(output="log", output_return=False, check=None):
raise RuntimeError("Can't use output_return with output: " + output) raise RuntimeError("Can't use output_return with output: " + output)
def background(args, cmd, working_dir=None): def background(cmd, working_dir=None):
""" Run a subprocess in background and redirect its output to the log. """ """ Run a subprocess in background and redirect its output to the log. """
ret = subprocess.Popen(cmd, stdout=args.logfd, stderr=args.logfd, ret = subprocess.Popen(cmd, stdout=pmb.helpers.logging.logfd,
cwd=working_dir) stderr=pmb.helpers.logging.logfd, cwd=working_dir)
logging.debug(f"New background process: pid={ret.pid}, output=background") logging.debug(f"New background process: pid={ret.pid}, output=background")
return ret return ret
def pipe(args, cmd, working_dir=None): def pipe(cmd, working_dir=None):
""" Run a subprocess in background and redirect its output to a pipe. """ """ Run a subprocess in background and redirect its output to a pipe. """
ret = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=args.logfd, ret = subprocess.Popen(cmd, stdout=subprocess.PIPE,
cwd=working_dir) stderr=pmb.helpers.logging.logfd, cwd=working_dir)
logging.verbose(f"New background process: pid={ret.pid}, output=pipe") logging.verbose(f"New background process: pid={ret.pid}, output=pipe")
return ret return ret
def pipe_read(args, process, output_to_stdout=False, output_return=False, def pipe_read(process, output_to_stdout=False, output_return=False,
output_return_buffer=False): output_return_buffer=False):
""" """
Read all available output from a subprocess and copy it to the log and Read all available output from a subprocess and copy it to the log and
@ -69,7 +69,7 @@ def pipe_read(args, process, output_to_stdout=False, output_return=False,
# Copy available output # Copy available output
out = process.stdout.readline() out = process.stdout.readline()
if len(out): if len(out):
args.logfd.buffer.write(out) pmb.helpers.logging.logfd.buffer.write(out)
if output_to_stdout: if output_to_stdout:
sys.stdout.buffer.write(out) sys.stdout.buffer.write(out)
if output_return: if output_return:
@ -77,7 +77,7 @@ def pipe_read(args, process, output_to_stdout=False, output_return=False,
continue continue
# No more output (flush buffers) # No more output (flush buffers)
args.logfd.flush() pmb.helpers.logging.logfd.flush()
if output_to_stdout: if output_to_stdout:
sys.stdout.flush() sys.stdout.flush()
return return
@ -175,11 +175,11 @@ def foreground_pipe(args, cmd, working_dir=None, output_to_stdout=False,
continue continue
# Read all currently available output # Read all currently available output
pipe_read(args, process, output_to_stdout, output_return, pipe_read(process, output_to_stdout, output_return,
output_buffer) output_buffer)
# There may still be output after the process quit # There may still be output after the process quit
pipe_read(args, process, output_to_stdout, output_return, output_buffer) pipe_read(process, output_to_stdout, output_return, output_buffer)
# Return the return code and output (the output gets built as list of # Return the return code and output (the output gets built as list of
# output chunks and combined at the end, this is faster than extending the # output chunks and combined at the end, this is faster than extending the
@ -313,11 +313,11 @@ def core(args, log_message, cmd, working_dir=None, output="log",
# Background # Background
if output == "background": if output == "background":
return background(args, cmd, working_dir) return background(cmd, working_dir)
# Pipe # Pipe
if output == "pipe": if output == "pipe":
return pipe(args, cmd, working_dir) return pipe(cmd, working_dir)
# Foreground # Foreground
output_after_run = "" output_after_run = ""

2
test/test_apk_static.py
View file

@ -21,7 +21,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_aportgen.py
View file

@ -23,7 +23,7 @@ def args(tmpdir, request):
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
args.fork_alpine = False args.fork_alpine = False
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

4
test/test_aportgen_device_wizard.py
View file

@ -21,7 +21,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
# Fake aports folder: # Fake aports folder:
tmpdir = str(tmpdir) tmpdir = str(tmpdir)
@ -55,7 +55,7 @@ def generate(args, monkeypatch, answers):
pmb.parse.deviceinfo(). pmb.parse.deviceinfo().
""" """
# Patched function # Patched function
def fake_ask(args, question="Continue?", choices=["y", "n"], default="n", def fake_ask(question="Continue?", choices=["y", "n"], default="n",
lowercase_answer=True, validation_regex=None, complete=None): lowercase_answer=True, validation_regex=None, complete=None):
for substr, answer in answers.items(): for substr, answer in answers.items():
if substr in question: if substr in question:

2
test/test_bootimg.py
View file

@ -18,7 +18,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_build_is_necessary.py
View file

@ -16,7 +16,7 @@ def args(request, tmpdir):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
# Create an empty APKINDEX.tar.gz file, so we can use its path and # Create an empty APKINDEX.tar.gz file, so we can use its path and
# timestamp to put test information in the cache. # timestamp to put test information in the cache.

2
test/test_build_package.py
View file

@ -23,7 +23,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_config_pmaports.py
View file

@ -20,7 +20,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_config_user.py
View file

@ -18,7 +18,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_config_workdir.py
View file

@ -19,7 +19,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_cross_compile_distcc.py
View file

@ -17,7 +17,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_crossdirect.py
View file

@ -19,7 +19,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_envkernel.py
View file

@ -20,7 +20,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_file.py
View file

@ -18,7 +18,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_git.py
View file

@ -22,7 +22,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_lint.py
View file

@ -18,7 +18,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_package.py
View file

@ -15,7 +15,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_pmaports.py
View file

@ -15,7 +15,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_repo.py
View file

@ -17,7 +17,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_repo_missing.py
View file

@ -14,7 +14,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_status.py
View file

@ -19,7 +19,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_helpers_ui.py
View file

@ -17,7 +17,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_install.py
View file

@ -21,7 +21,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_kconfig_check.py
View file

@ -16,7 +16,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_keys.py
View file

@ -19,7 +19,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_newapkbuild.py
View file

@ -22,7 +22,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_parse_apkbuild.py
View file

@ -15,7 +15,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_parse_apkindex.py
View file

@ -19,7 +19,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_parse_depends.py
View file

@ -19,7 +19,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_parse_deviceinfo.py
View file

@ -14,7 +14,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_pkgrel_bump.py
View file

@ -19,7 +19,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_qemu_running_processes.py
View file

@ -28,7 +28,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

26
test/test_questions.py
View file

@ -21,7 +21,7 @@ def args(tmpdir, request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args
@ -34,7 +34,7 @@ def fake_answers(monkeypatch, answers):
In this example, the first question is answered with "y", In this example, the first question is answered with "y",
the second question with "n" and so on. the second question with "n" and so on.
""" """
def fake_ask(args, question="Continue?", choices=["y", "n"], default="n", def fake_ask(question="Continue?", choices=["y", "n"], default="n",
lowercase_answer=True, validation_regex=None, complete=None): lowercase_answer=True, validation_regex=None, complete=None):
answer = answers.pop(0) answer = answers.pop(0)
logging.info("pmb.helpers.cli.ask() fake answer: " + answer) logging.info("pmb.helpers.cli.ask() fake answer: " + answer)
@ -44,8 +44,8 @@ def fake_answers(monkeypatch, answers):
def test_fake_answers_selftest(monkeypatch): def test_fake_answers_selftest(monkeypatch):
fake_answers(monkeypatch, ["first", "second"]) fake_answers(monkeypatch, ["first", "second"])
assert pmb.helpers.cli.ask(args) == "first" assert pmb.helpers.cli.ask() == "first"
assert pmb.helpers.cli.ask(args) == "second" assert pmb.helpers.cli.ask() == "second"
def test_questions_booleans(args, monkeypatch): def test_questions_booleans(args, monkeypatch):
@ -61,7 +61,7 @@ def test_questions_strings(args, monkeypatch):
functions = [pmb.aportgen.device.ask_for_manufacturer] functions = [pmb.aportgen.device.ask_for_manufacturer]
for func in functions: for func in functions:
fake_answers(monkeypatch, ["Simple string answer"]) fake_answers(monkeypatch, ["Simple string answer"])
assert func(args) == "Simple string answer" assert func() == "Simple string answer"
def test_questions_name(args, monkeypatch): def test_questions_name(args, monkeypatch):
@ -69,18 +69,18 @@ def test_questions_name(args, monkeypatch):
# Manufacturer should get added automatically, but not twice # Manufacturer should get added automatically, but not twice
fake_answers(monkeypatch, ["Amazon Thor"]) fake_answers(monkeypatch, ["Amazon Thor"])
assert func(args, "Amazon") == "Amazon Thor" assert func("Amazon") == "Amazon Thor"
fake_answers(monkeypatch, ["Thor"]) fake_answers(monkeypatch, ["Thor"])
assert func(args, "Amazon") == "Amazon Thor" assert func("Amazon") == "Amazon Thor"
# Don't add the manufacturer when it starts with "Google" # Don't add the manufacturer when it starts with "Google"
fake_answers(monkeypatch, ["Google Nexus 12345"]) fake_answers(monkeypatch, ["Google Nexus 12345"])
assert func(args, "Amazon") == "Google Nexus 12345" assert func("Amazon") == "Google Nexus 12345"
def test_questions_arch(args, monkeypatch): def test_questions_arch(args, monkeypatch):
fake_answers(monkeypatch, ["invalid_arch", "aarch64"]) fake_answers(monkeypatch, ["invalid_arch", "aarch64"])
assert pmb.aportgen.device.ask_for_architecture(args) == "aarch64" assert pmb.aportgen.device.ask_for_architecture() == "aarch64"
def test_questions_bootimg(args, monkeypatch): def test_questions_bootimg(args, monkeypatch):
@ -196,16 +196,16 @@ def test_questions_device_nonfree(args, monkeypatch):
def test_questions_flash_methods(args, monkeypatch): def test_questions_flash_methods(args, monkeypatch):
func = pmb.aportgen.device.ask_for_flash_method func = pmb.aportgen.device.ask_for_flash_method
fake_answers(monkeypatch, ["invalid_flash_method", "fastboot"]) fake_answers(monkeypatch, ["invalid_flash_method", "fastboot"])
assert func(args) == "fastboot" assert func() == "fastboot"
fake_answers(monkeypatch, ["0xffff"]) fake_answers(monkeypatch, ["0xffff"])
assert func(args) == "0xffff" assert func() == "0xffff"
fake_answers(monkeypatch, ["heimdall", "invalid_type", "isorec"]) fake_answers(monkeypatch, ["heimdall", "invalid_type", "isorec"])
assert func(args) == "heimdall-isorec" assert func() == "heimdall-isorec"
fake_answers(monkeypatch, ["heimdall", "bootimg"]) fake_answers(monkeypatch, ["heimdall", "bootimg"])
assert func(args) == "heimdall-bootimg" assert func() == "heimdall-bootimg"
def test_questions_keymaps(args, monkeypatch): def test_questions_keymaps(args, monkeypatch):

8
test/test_run_core.py
View file

@ -16,7 +16,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args
@ -44,7 +44,7 @@ def test_sanity_checks():
def test_background(args): def test_background(args):
# Sleep in background # Sleep in background
process = pmb.helpers.run_core.background(args, ["sleep", "1"], "/") process = pmb.helpers.run_core.background(["sleep", "1"], "/")
# Check if it is still running # Check if it is still running
assert process.poll() is None assert process.poll() is None
@ -52,13 +52,13 @@ def test_background(args):
def test_pipe(args): def test_pipe(args):
# Sleep in background # Sleep in background
process = pmb.helpers.run_core.pipe(args, ["sleep", "1"], "/") process = pmb.helpers.run_core.pipe(["sleep", "1"], "/")
# Check if it is still running # Check if it is still running
assert process.poll() is None assert process.poll() is None
# Print output in background # Print output in background
process = pmb.helpers.run_core.pipe(args, ["echo", "-n", "hello"], "/") process = pmb.helpers.run_core.pipe(["echo", "-n", "hello"], "/")
# Read output # Read output
assert process.communicate()[0].decode('utf-8') == "hello" assert process.communicate()[0].decode('utf-8') == "hello"

2
test/test_shell_escape.py
View file

@ -17,7 +17,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args

2
test/test_version.py
View file

@ -17,7 +17,7 @@ def args(request):
args = pmb.parse.arguments() args = pmb.parse.arguments()
args.log = args.work + "/log_testsuite.txt" args.log = args.work + "/log_testsuite.txt"
pmb.helpers.logging.init(args) pmb.helpers.logging.init(args)
request.addfinalizer(args.logfd.close) request.addfinalizer(pmb.helpers.logging.logfd.close)
return args return args