summary refs log tree commit diff
path: root/nixos/tests/virtualbox.nix
diff options
context:
space:
mode:
authorDennis Gosnell <cdep.illabout@gmail.com>2018-08-29 05:28:47 +0900
committerxeji <36407913+xeji@users.noreply.github.com>2018-08-28 22:28:47 +0200
commit7d23ffb73670f1e6a064c6ad3ceed250bc7086ac (patch)
tree29719e5fab8892b4e820b77c56bab949547d81bf /nixos/tests/virtualbox.nix
parentbc09c145198fec2336bec71a6f77ecb4183bab0d (diff)
downloadnixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar.gz
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar.bz2
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar.lz
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar.xz
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.tar.zst
nixpkgs-7d23ffb73670f1e6a064c6ad3ceed250bc7086ac.zip
virtualbox: Change the virtualbox tests to not build the unfree tests by default. (#45415)
Diffstat (limited to 'nixos/tests/virtualbox.nix')
-rw-r--r--nixos/tests/virtualbox.nix42
1 files changed, 22 insertions, 20 deletions
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 4207112cf16..ce84576edca 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -1,4 +1,4 @@
-{ system ? builtins.currentSystem, debug ? false }:
+{ system ? builtins.currentSystem, debug ? false, enableUnfree ? false }:
 
 with import ../lib/testing.nix { inherit system; };
 with pkgs.lib;
@@ -378,6 +378,26 @@ let
     };
   };
 
+  unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) {
+    enable-extension-pack = ''
+      createVM_testExtensionPack;
+      vbm("startvm testExtensionPack");
+      waitForStartup_testExtensionPack;
+      $machine->screenshot("cli_started");
+      waitForVMBoot_testExtensionPack;
+      $machine->screenshot("cli_booted");
+
+      $machine->nest("Checking for privilege escalation", sub {
+        $machine->fail("test -e '/root/VirtualBox VMs'");
+        $machine->fail("test -e '/root/.config/VirtualBox'");
+        $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
+      });
+
+      shutdownVM_testExtensionPack;
+      destroyVM_testExtensionPack;
+    '';
+  };
+
 in mapAttrs (mkVBoxTest false vboxVMs) {
   simple-gui = ''
     createVM_simple;
@@ -484,22 +504,4 @@ in mapAttrs (mkVBoxTest false vboxVMs) {
     destroyVM_test1;
     destroyVM_test2;
   '';
-} // mapAttrs (mkVBoxTest true vboxVMsWithExtpack) {
-  enable-extension-pack = ''
-    createVM_testExtensionPack;
-    vbm("startvm testExtensionPack");
-    waitForStartup_testExtensionPack;
-    $machine->screenshot("cli_started");
-    waitForVMBoot_testExtensionPack;
-    $machine->screenshot("cli_booted");
-
-    $machine->nest("Checking for privilege escalation", sub {
-      $machine->fail("test -e '/root/VirtualBox VMs'");
-      $machine->fail("test -e '/root/.config/VirtualBox'");
-      $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
-    });
-
-    shutdownVM_testExtensionPack;
-    destroyVM_testExtensionPack;
-  '';
-}
+} // (if enableUnfree then unfreeTests else {})