nixosTests.custom-ca: handleTest -> runTest

Changed files
+5 -11
nixos
+1 -1
nixos/tests/all-tests.nix
···
cryptpad = runTest ./cryptpad.nix;
cups-pdf = runTest ./cups-pdf.nix;
curl-impersonate = runTest ./curl-impersonate.nix;
-
custom-ca = handleTest ./custom-ca.nix { };
croc = runTest ./croc.nix;
cross-seed = runTest ./cross-seed.nix;
cyrus-imap = runTest ./cyrus-imap.nix;
···
cryptpad = runTest ./cryptpad.nix;
cups-pdf = runTest ./cups-pdf.nix;
curl-impersonate = runTest ./curl-impersonate.nix;
+
custom-ca = import ./custom-ca.nix { inherit pkgs runTest; };
croc = runTest ./croc.nix;
cross-seed = runTest ./cross-seed.nix;
cyrus-imap = runTest ./cyrus-imap.nix;
+4 -10
nixos/tests/custom-ca.nix
···
# The test checks that certificates issued by a custom
# trusted CA are accepted but those from an unknown CA are rejected.
-
{
-
system ? builtins.currentSystem,
-
config ? { },
-
pkgs ? import ../.. { inherit system config; },
-
}:
-
-
with import ../lib/testing-python.nix { inherit system pkgs; };
let
inherit (pkgs) lib;
···
};
};
-
curlTest = makeTest {
name = "custom-ca-curl";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
nodes.machine = { ... }: webserverConfig;
···
mkBrowserTest =
browser: testParams:
-
makeTest {
name = "custom-ca-${browser}";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
···
{
curl = curlTest;
}
-
// pkgs.lib.mapAttrs mkBrowserTest {
firefox = {
error = "Security Risk";
};
···
# The test checks that certificates issued by a custom
# trusted CA are accepted but those from an unknown CA are rejected.
+
{ runTest, pkgs }:
let
inherit (pkgs) lib;
···
};
};
+
curlTest = runTest {
name = "custom-ca-curl";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
nodes.machine = { ... }: webserverConfig;
···
mkBrowserTest =
browser: testParams:
+
runTest {
name = "custom-ca-${browser}";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
···
{
curl = curlTest;
}
+
// lib.mapAttrs mkBrowserTest {
firefox = {
error = "Security Risk";
};