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

pmbootstrap: kill process if silent for 5 minutes (rewrite logging)

Browse source
This commit is contained in:
Oliver Smith 2018-07-14 01:13:28 +00:00
parent a9f149153a
commit 8268dc0e3d
31 changed files with 544 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/test_qemu_running_processes.py
View file

@ -60,11 +60,11 @@ def ssh_create_askpass_script(args):
pmb.chroot.root(args, ["chmod", "+x", "/tmp/y.sh"])
def pmbootstrap_run(args, config, parameters, background=False):
def pmbootstrap_run(args, config, parameters, output="log"):
"""Execute pmbootstrap.py with a test pmbootstrap.conf."""
return pmb.helpers.run.user(args, ["./pmbootstrap.py", "-c", config] +
parameters, working_dir=pmb_src,
background=background)
output=output)
def pmbootstrap_yes(args, config, parameters):
@ -111,7 +111,7 @@ class Qemu(object):
# Create and run system image
pmbootstrap_yes(args, config, ["install", "--no-fde"])
self.process = pmbootstrap_run(args, config, ["qemu", "--display",
"none"], background=True)
"none"], "background")
@pytest.fixture
@ -130,8 +130,7 @@ def ssh_run(args, command):
"-o", "UserKnownHostsFile=/dev/null",
"-o", "StrictHostKeyChecking=no",
"-p", "2222", "testuser@localhost", "--",
command],
check=False, return_stdout=True)
command], output_return=True, check=False)
return ret