Re-enable systemd-nspawn test

cole-h · cole-h · commit 883092e3f78d · 2023-09-20T09:09:01.000-07:00
It was disabled in c6953d1 because a recent Nixpkgs bump brought in a new systemd which changed how systemd-nspawn worked. As far as I can tell, the issue was caused by this upstream systemd commit: systemd/systemd@b71a019 Bind-mounting the host's `/sys` and `/proc` into the container's `/run/host/{sys,proc}` fixes the issue and allows the test to succeed.
diff --git a/tests/nixos/containers/containers.nix b/tests/nixos/containers/containers.nix
@@ -56,8 +56,8 @@
     host.fail("nix build -v --auto-allocate-uids --no-sandbox -L --offline --impure --file ${./id-test.nix} --argstr name id-test-6 --arg uidRange true")
 
     # Run systemd-nspawn in a Nix build.
-    #host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}")
-    #host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]")
+    host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}")
+    host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]")
   '';
 
 }
diff --git a/tests/nixos/containers/systemd-nspawn.nix b/tests/nixos/containers/systemd-nspawn.nix
@@ -73,6 +73,8 @@ runCommand "test"
       --resolv-conf=off \
       --bind-ro=/nix/store \
       --bind=$out \
+      --bind=/proc:/run/host/proc \
+      --bind=/sys:/run/host/sys \
       --private-network \
       $toplevel/init
   ''

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@`
`56`	`56`	`host.fail("nix build -v --auto-allocate-uids --no-sandbox -L --offline --impure --file ${./id-test.nix} --argstr name id-test-6 --arg uidRange true")`
`57`	`57`
`58`	`58`	`# Run systemd-nspawn in a Nix build.`
`59`		`- #host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}")`
`60`		`- #host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]")`
	`59`	`+ host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}")`
	`60`	`+ host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]")`
`61`	`61`	`'';`
`62`	`62`
`63`	`63`	`}`