Merge #261

261: profilesTest/mkHosts: include host's configuration r=blaggacao a=Pacman99 Now that profiles test is done dynamically - first available host - we likely need to include the host configuration itself. I have profiles that depend on the domain being set, which how I ran into this, and I think other problems might occur if we don't include the full host in the profiles test. targeting core, since its a small bug fix and was planned to make into a release. Co-authored-by: Pacman99 <[email protected]>
divnix · Apr 24, 2021 · 82b73cf · 82b73cf
2 parents 7a825bb + 832d3bd
commit 82b73cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix
@@ -90,7 +90,7 @@ let
       lib = {
         lib = { inherit specialArgs; };
         lib.testModule = {
-          imports = builtins.attrValues modules;
+          imports = [ local ] ++ builtins.attrValues modules;
         };
       };
     in

diff --git a/lib/pkgs-lib/tests/default.nix b/lib/pkgs-lib/tests/default.nix
@@ -48,7 +48,7 @@ let
     };
 
     testScript = ''
-      machine.systemctl("is-system-running --wait")
+      ${host.config.networking.hostName}.systemctl("is-system-running --wait")
     '';
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ let @@
         };
         testScript = ''
-          machine.systemctl("is-system-running --wait")
+          ${host.config.networking.hostName}.systemctl("is-system-running --wait")
         '';
       };
@@ Expand Down @@