diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2024-05-30 02:46:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 02:46:23 +0000 |
| commit | 1be34af9f9e06672ad72a80e1af527661e8f5032 (patch) | |
| tree | 40adc464334bfe2541a50350f09a6c36aa1bf641 /nixos | |
| parent | 4e1b4397d98cb70192c71bfb66b8ae18e4f87f73 (diff) | |
| parent | 613d50c1d540afd87276d6947886ca95c90cff1e (diff) | |
Merge pull request #315499 from nh2/turbovnc-fix-negative-test
turbovnc.tests: Fix negative test
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/turbovnc-headless-server.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix index a155f9f907b25..e4eff4f078447 100644 --- a/nixos/tests/turbovnc-headless-server.nix +++ b/nixos/tests/turbovnc-headless-server.nix @@ -24,11 +24,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; # So that we can ssh into the VM, see e.g. - # http://blog.patapon.info/nixos-local-vm/#accessing-the-vm-with-ssh + # https://nixos.org/manual/nixos/stable/#sec-nixos-test-port-forwarding services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "yes"; - users.extraUsers.root.password = ""; users.mutableUsers = false; + # `test-instrumentation.nix` already sets an empty root password. + # The following have to all be set to allow an empty SSH login password. + services.openssh.settings.PermitRootLogin = "yes"; + services.openssh.settings.PermitEmptyPasswords = "yes"; + security.pam.services.sshd.allowNullPassword = true; # the default `UsePam yes` makes this necessary }; testScript = '' @@ -124,7 +127,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_until_succeeds("test -f /tmp/glxgears-should-fail.stderr") wait_until_terminated_or_succeeds( termination_check_shell_command="pidof glxgears", - success_check_shell_command="grep 'libGL error: failed to load driver: swrast' /tmp/glxgears-should-fail.stderr", + success_check_shell_command="grep 'MESA-LOADER: failed to open swrast' /tmp/glxgears-should-fail.stderr", get_detail_message_fn=lambda: "Contents of /tmp/glxgears-should-fail.stderr:\n" + machine.succeed("cat /tmp/glxgears-should-fail.stderr"), ) |