Merge pull request #144795 from hercules-ci/fix-issue-144613-nixosTest-wait-stdout-followup
nixosTests: followup stdout blocking fixes
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
"""
|
||||
)
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user