Merge pull request #172 from boinkor-net/strict-shellcheck-nixos-tests

Strict shellchecks in tests
boinkor-net · Oct 29, 2024 · a1687f7 · a1687f7
2 parents af34ed5 + fa4f6df
commit a1687f7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/tests/cmdline/basic.nix b/nixos/tests/cmdline/basic.nix
@@ -11,6 +11,7 @@ in
   helper {
     testConfig = {
       services.tsnsrv.services.basic.toURL = "http://127.0.0.1:3000";
+      systemd.services.tsnsrv-basic.enableStrictShellChecks = true;
     };
     testScript = ''
       machine.wait_for_unit("tsnsrv-basic")

diff --git a/nixos/tests/cmdline/with-custom-certs.nix b/nixos/tests/cmdline/with-custom-certs.nix
@@ -15,6 +15,7 @@ in
         certificateFile = "/tmp/cert.pem";
         certificateKey = "/tmp/key.pem";
       };
+      systemd.services.tsnsrv-custom.enableStrictShellChecks = true;
     };
     testScript = ''
       machine.wait_for_unit("tsnsrv-custom")

diff --git a/nixos/tests/e2e/oci.nix b/nixos/tests/e2e/oci.nix
@@ -16,6 +16,7 @@ in
         address = "[::]";
         settings = {
           ip_prefixes = ["100.64.0.0/10"];
+          dns.magic_dns = false;
           derp.server = {
             enabled = true;
             region_id = 999;
@@ -84,6 +85,7 @@ in
           };
         };
       };
+      systemd.services.podman-web-server-tsnsrv.enableStrictShellChecks = true;
       networking.firewall.trustedInterfaces = ["podman0"];
 
       # Delay starting the container machinery until we have an authkey:

diff --git a/nixos/tests/e2e/systemd.nix b/nixos/tests/e2e/systemd.nix
@@ -12,8 +12,6 @@ in
     defaults.services.tsnsrv.enable = true;
     defaults.services.tsnsrv.defaults.tsnetVerbose = true;
 
-    # defaults.services.tsnsrv.defaults.package = config.packages.tsnsrvCmdLineValidator;
-
     nodes.machine = {
       config,
       pkgs,
@@ -43,6 +41,7 @@ in
         enable = true;
         settings = {
           ip_prefixes = ["100.64.0.0/10"];
+          dns.magic_dns = false;
           derp.server = {
             enabled = true;
             region_id = 999;
@@ -81,6 +80,7 @@ in
       };
 
       systemd.services.tsnsrv-basic = {
+        enableStrictShellChecks = true;
         wants = ["[email protected]"];
         after = ["[email protected]"];
         unitConfig.Requires = ["[email protected]"];