diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-20 19:38:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 19:38:58 +0100 |
| commit | 79f22e571a51235f70678ed08112a1fe89f374ef (patch) | |
| tree | 1336753b22eae0a254e04aa44628b747422a8fab /nixos | |
| parent | cfac57e2ed9751b21fe1134e32c78207f8c90ddc (diff) | |
| parent | a19b4efc77b76d5c66edb31e2ae285f5c1c3ca17 (diff) | |
| download | nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar.gz nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar.bz2 nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar.lz nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar.xz nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.tar.zst nixpkgs-79f22e571a51235f70678ed08112a1fe89f374ef.zip | |
Merge pull request #146545 from rnhmjoj/pr-p11kit-fedora-staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/custom-ca.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 4480519c7ed..6ed3510dd2c 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -82,7 +82,7 @@ in # chromium-based browsers refuse to run as root test-support.displayManager.auto.user = "alice"; # browsers may hang with the default memory - virtualisation.memorySize = 500; + virtualisation.memorySize = 600; networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ]; security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ]; @@ -162,7 +162,7 @@ in browser = command.split()[0] with subtest("Good certificate is trusted in " + browser): execute_as( - "alice", f"env P11_KIT_DEBUG=trust {command} https://good.example.com & >&2" + "alice", f"{command} https://good.example.com >&2 &" ) wait_for_window_as("alice", browser) machine.wait_for_text("It works!") @@ -170,9 +170,9 @@ in execute_as("alice", "xdotool key ctrl+w") # close tab with subtest("Unknown CA is untrusted in " + browser): - execute_as("alice", f"{command} https://bad.example.com & >&2") + execute_as("alice", f"{command} https://bad.example.com >&2 &") machine.wait_for_text(error) machine.screenshot("bad" + browser) - machine.succeed("pkill " + browser) + machine.succeed("pkill -f " + browser) ''; }) |