Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc09c145198f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d23ffb73670
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 28, 2018

  1. virtualbox: Change the virtualbox tests to not build the unfree tests… 

    … by default. (#45415)
    @cdepillabout @xeji
    cdepillabout authored and xeji committed Aug 28, 2018
    Copy the full SHA
    7d23ffb View commit details
Showing with 22 additions and 20 deletions.
  1. +22 −20 nixos/tests/virtualbox.nix
42 changes: 22 additions & 20 deletions nixos/tests/virtualbox.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {})