From edc67d3862c242b254e3eff0b61bd5cef989e4d1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 5 Nov 2021 21:13:25 +0100 Subject: [PATCH 1/4] nixosTests.chromium: Redirect stdout to avoid blocking --- nixos/tests/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index d67acd075a13..1df4def66374 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -86,7 +86,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { options.append("--use-gl=swiftshader") # Launch the process: options.append("file://${startupHTML}") - machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown')) + machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} >&2 & disown')) if binary.startswith("google-chrome"): # Need to click away the first window: machine.wait_for_text("Make Google Chrome the default browser") From 0fb806301dd627c7eb342658796da1a8c9ba586e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 5 Nov 2021 21:13:36 +0100 Subject: [PATCH 2/4] nixosTests.pantheon: Redirect stdout to avoid blocking --- nixos/tests/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 20aee2eb7a4c..aebf6b534476 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -51,7 +51,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_for_window("plank") with subtest("Open elementary terminal"): - machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal &'") + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'") machine.wait_for_window("io.elementary.terminal") machine.sleep(20) machine.screenshot("screen") From 1927b71928f8f9420c2df48222a1b6808251b4e1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 5 Nov 2021 21:13:47 +0100 Subject: [PATCH 3/4] nixosTests.xfce: Redirect stdout to avoid blocking --- nixos/tests/xfce.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 99e30342e593..148eccdbe308 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Check that logging in has given the user ownership of devices. machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'") + machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal >&2 &'") machine.wait_for_window("Terminal") machine.sleep(10) machine.screenshot("screen") From d65985674794acc54dce4052239686cf8784d496 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 5 Nov 2021 21:22:31 +0100 Subject: [PATCH 4/4] nixosTests.service-runner: Redirect stdout to avoid blocking --- nixos/tests/service-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index 58f46735f56d..79d96f739a6c 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.succeed( """ mkdir -p /run/nginx /var/log/nginx /var/cache/nginx - ${nodes.machine.config.systemd.services.nginx.runner} & + ${nodes.machine.config.systemd.services.nginx.runner} >&2 & echo $!>my-nginx.pid """ )