Use the new nixpkgs.lib.nixos.runTest interface for checks

[nixos-qemu-vm-isolation] / checks / mount-grep.nix

diff --git a/checks/mount-grep.nix b/checks/mount-grep.nix
index f8fed0e2af7a8b0188379f7a25a5d66e67eeb989..90ae4a7d8e3c33b59228e3c81703ad4706bc3f2f 100644 (file)
--- a/checks/mount-grep.nix
+++ b/checks/mount-grep.nix
@@ -1,17 +1,33 @@
-{ pkgs, ... }: {
+pkgs: {
   name = "qemu-private-store-mount-grep";
 
+  hostPkgs = pkgs;
+
   nodes = {
     shared = _: { };
     private = _: { imports = [ ../modules/qemu-vm-isolation.nix ]; };
+    useNixStoreImage = {
+      virtualisation = {
+        sharedDirectories = pkgs.lib.mkForce { };
+        useNixStoreImage = true;
+      };
+    };
   };
 
   testScript = ''
     start_all()
     shared.wait_for_unit("multi-user.target")
     private.wait_for_unit("multi-user.target")
+    useNixStoreImage.wait_for_unit("multi-user.target")
 
     shared.succeed("[[ $(mount | grep -c virt) -gt 0 ]]")
     private.succeed("[[ $(mount | grep -c virt) -eq 0 ]]")
+    useNixStoreImage.succeed("[[ $(mount | grep -c virt) -eq 0 ]]")
+
+    shared.succeed("[[ -e ${pkgs.pv} ]]")
+    private.fail("[[ -e ${pkgs.pv} ]]")
+
+    # useNixStoreImage isn't ready until this works:
+    # useNixStoreImage.fail("[[ -e ${pkgs.pv} ]]")
   '';
 }