Reduce repetition in test script

diff --git a/checks/mount-grep.nix b/checks/mount-grep.nix
index 33478ea687c2229ababb3b7faa4568e479a47b71..f7eb3a327a367e2ec4d16dee8cf271f0308b0e03 100644 (file)
--- a/checks/mount-grep.nix
+++ b/checks/mount-grep.nix
@@ -18,16 +18,14 @@ pkgs: {
 
   testScript = ''
     start_all()
 
   testScript = ''
     start_all()

-    shared.wait_for_unit("multi-user.target")
-    private.wait_for_unit("multi-user.target")
-    useNixStoreImage.wait_for_unit("multi-user.target")
+    for machine in [shared, private, useNixStoreImage]:
+      machine.wait_for_unit("multi-user.target")

 
     shared.succeed("[[ $(mount | grep -c virt) -gt 0 ]]")
 
     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} ]]")
     shared.succeed("[[ -e ${pkgs.pv} ]]")

-    private.fail("[[ -e ${pkgs.pv} ]]")
-    useNixStoreImage.fail("[[ -e ${pkgs.pv} ]]")
+
+    for machine in [private, useNixStoreImage]:
+      machine.succeed("[[ $(mount | grep -c virt) -eq 0 ]]")
+      machine.fail("[[ -e ${pkgs.pv} ]]")

   '';
 }
   '';
 }