cleanup in tests
This commit is contained in:
parent
6931853de3
commit
f447fd0a99
5 changed files with 29 additions and 35 deletions
|
|
@ -1,9 +1,11 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
services.distccd = {
|
||||
enable = true;
|
||||
jobTimeout = 900;
|
||||
maxJobs = 12;
|
||||
logLevel = "warning";
|
||||
nice = -10;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -82,8 +82,10 @@ def do_apply():
|
|||
""".strip())
|
||||
|
||||
machine.wait_for_unit("default.target")
|
||||
assert "lix" in machine.succeed("nix --version").lower()
|
||||
machine.log("INIT")
|
||||
machine.wait_for_unit("install-dynix.service")
|
||||
|
||||
dynix_out = machine.succeed("dynix --version")
|
||||
assert "dynix" in dynix_out, f"dynix not in {dynix_out=}"
|
||||
|
||||
# Config should have our initial values.
|
||||
args = get_cli_args()
|
||||
|
|
@ -99,17 +101,13 @@ args = get_cli_args()
|
|||
assert args.jobs == 12, f'{args.jobs=} != 12'
|
||||
assert args.job_lifetime == 900, f'{args.job_lifetime} != 900'
|
||||
assert args.log_level == 'warning', f'{args.log_level=} != warning'
|
||||
#machine.log(f"config.toml after first rebuild: {indent(pformat(args))}")
|
||||
#assert int(args['workers']) == 4, f"{args['workers']=} != 4"
|
||||
#assert int(args['max_connection_rate']) == 256, f"{args['max_connection_rate']=} != 256"
|
||||
|
||||
new_jobs = 4
|
||||
dynix_append("services.distccd.maxJobs", new_jobs)
|
||||
do_apply()
|
||||
|
||||
args = get_cli_args()
|
||||
|
||||
# Only jobs should have changed. The others should still be default.
|
||||
args = get_cli_args()
|
||||
assert args.jobs == new_jobs, f'{args.jobs=} != {new_jobs=}'
|
||||
assert args.job_lifetime == 900, f'{args.job_lifetime} != 900'
|
||||
assert args.log_level == 'warning', f'{args.log_level=} != warning'
|
||||
|
|
@ -119,6 +117,13 @@ dynix_append("services.distccd.logLevel", f'"{new_log_level}"')
|
|||
do_apply()
|
||||
|
||||
args = get_cli_args()
|
||||
#assert args.jobs == new_jobs, f'{args.jobs=} != {new_jobs=}'
|
||||
#assert args.job_lifetime == 900, f'{args.job_lifetime} != 900'
|
||||
assert args.jobs == new_jobs, f'{args.jobs=} != {new_jobs=}'
|
||||
assert args.job_lifetime == 900, f'{args.job_lifetime} != 900'
|
||||
assert args.log_level == new_log_level, f'{args.log_level=} != {new_log_level=}'
|
||||
|
||||
# And this should set everything back.
|
||||
machine.succeed("env PAGER= nixos-rebuild switch --log-format raw-with-logs --fallback")
|
||||
args = get_cli_args()
|
||||
assert args.jobs == 12, f'{args.jobs=} != 12'
|
||||
assert args.job_lifetime == 900, f'{args.job_lifetime} != 900'
|
||||
assert args.log_level == 'warning', f'{args.log_level=} != warning'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue