Change some sleep tricks into proper availability checks

This commit is contained in:
Sander van der Burg 2021-03-22 20:35:08 +01:00 committed by Sander van der Burg
parent 814294f6f8
commit deb88e3427
3 changed files with 3 additions and 3 deletions

View File

@ -54,8 +54,8 @@ makeTest {
"${env} nixproc-supervisord-deploy-stateless ${nix-processmgmt}/examples/webapps-agnostic/processes.nix &"
)
machine.wait_for_open_port(9001)
machine.succeed("sleep 30")
machine.succeed("cat supervisord.log >&2")
check_nginx_redirection()
'';
}

View File

@ -109,6 +109,7 @@ makeTest {
machine.succeed(
"${env} nixproc-systemd-switch ${nix-processmgmt}/tests/processes-supervisord.nix"
)
machine.wait_for_open_port(9001)
# Deploy the system with foreground webapp processes

View File

@ -99,8 +99,7 @@ makeTest {
start_all()
machine.wait_for_unit("display-manager.service")
# Wait a little longer to be sure that the user has logged in
machine.succeed("sleep 10")
machine.wait_until_succeeds("pgrep -f 'systemd --user'")
# Do an undeploy to force the state to get initialized
machine.succeed(