summary refs log tree commit diff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-09-29 16:35:08 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2021-09-29 16:35:08 +0200
commit58be230026659b11cce8ac0d97f937149689889c (patch)
treed66bd2737a7cad36677637206f8e4a49720fb471
parent7960244eb1eeae9e3fb6dceaca72fd70814063c4 (diff)
downloadnixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar.gz
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar.bz2
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar.lz
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar.xz
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.tar.zst
nixpkgs-58be230026659b11cce8ac0d97f937149689889c.zip
nixos/tests/custom-ca: falkon -> qutebrowser
Use qutebrowser as the QtWebEngine test case because falkon has been
broken for a while.
-rw-r--r--nixos/tests/custom-ca.nix22
1 files changed, 11 insertions, 11 deletions
diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix
index c9657e8eff5..05cfbbb2fdf 100644
--- a/nixos/tests/custom-ca.nix
+++ b/nixos/tests/custom-ca.nix
@@ -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)