diff options
author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-09-29 16:54:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-29 16:54:32 +0200 |
commit | 28e1ca8ebf09fc1f5c8294c641da114b3983ec92 (patch) | |
tree | 0f595246e7f347e49167419fca98a7b4b5f65180 /nixos | |
parent | 3ffc3d2759c1bee8005364f76e604ca6a3ac749b (diff) | |
parent | 58be230026659b11cce8ac0d97f937149689889c (diff) | |
download | nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar.gz nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar.bz2 nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar.lz nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar.xz nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.tar.zst nixpkgs-28e1ca8ebf09fc1f5c8294c641da114b3983ec92.zip |
Merge pull request #139907 from rnhmjoj/test-fixes
nixos/tests: fix for memorySize being an integer
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/custom-ca.nix | 24 | ||||
-rw-r--r-- | nixos/tests/firefox.nix | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 26f29a3e68f..05cfbbb2fdf 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 = 500; networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ]; security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ]; @@ -113,7 +113,7 @@ in # which is why it will not use the system certificate store for the time being. # firefox chromium - falkon + qutebrowser midori ]; }; @@ -152,21 +152,21 @@ in with subtest("Unknown CA is untrusted in curl"): machine.fail("curl -fv https://bad.example.com") - browsers = [ + browsers = { # Firefox was disabled here, because we needed to disable p11-kit support in nss, # which is why it will not use the system certificate store for the time being. - # "firefox", - "chromium", - "falkon", - "midori" - ] - errors = ["Security Risk", "not private", "Certificate Error", "Security"] + #"firefox": "Security Risk", + "chromium": "not private", + "qutebrowser -T": "Certificate error", + "midori": "Security" + } machine.wait_for_x() - for browser, error in zip(browsers, errors): + for command, error in browsers.items(): + browser = command.split()[0] with subtest("Good certificate is trusted in " + browser): execute_as( - "alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2" + "alice", f"env P11_KIT_DEBUG=trust {command} https://good.example.com & >&2" ) wait_for_window_as("alice", browser) machine.wait_for_text("It works!") @@ -174,7 +174,7 @@ in execute_as("alice", "xdotool key ctrl+w") # close tab with subtest("Unknown CA is untrusted in " + browser): - execute_as("alice", f"{browser} 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) diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 4ad45c02240..dcaf369b62b 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { ]; # Need some more memory to record audio. - virtualisation.memorySize = "500"; + virtualisation.memorySize = 500; # Create a virtual sound device, with mixing # and all, for recording audio. |