mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
nixosTests.nix-upgrade: fix failing test
The test currently fails because we attempt to switch to a NixOS configuration that is _very_ different from the one we are switching from (e.g. the new configuration has an entirely empty /etc/fstab, causing switch-to-configuration to want to start unmounting all filesystems defined in the old configuration).
This commit is contained in:
parent
a6c47dcae2
commit
c2621cb78a
@ -7,17 +7,6 @@ let
|
||||
${pkgs.system} = "${nixVersions.latest}";
|
||||
}'';
|
||||
|
||||
inputDrv = import ../.. {
|
||||
configuration = {
|
||||
imports = [ nixos-module ];
|
||||
nix.package = nixVersions.latest;
|
||||
boot.isContainer = true;
|
||||
|
||||
users.users.alice.isNormalUser = true;
|
||||
};
|
||||
system = pkgs.system;
|
||||
};
|
||||
|
||||
nixos-module = builtins.toFile "nixos-module.nix" ''
|
||||
{ lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
@ -53,8 +42,13 @@ pkgs.testers.nixosTest {
|
||||
nix.package = nixVersions.stable;
|
||||
system.extraDependencies = [
|
||||
fallback-paths-external
|
||||
inputDrv.system
|
||||
];
|
||||
|
||||
specialisation.newer-nix.configuration = {
|
||||
nix.package = lib.mkForce nixVersions.latest;
|
||||
|
||||
users.users.alice.isNormalUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
@ -91,7 +85,7 @@ pkgs.testers.nixosTest {
|
||||
|
||||
with subtest("upgrade-via-switch-to-configuration"):
|
||||
# not using nixos-rebuild due to nix-instantiate being called and forcing all drv's to be rebuilt
|
||||
print(machine.succeed("${inputDrv.system.outPath}/bin/switch-to-configuration switch"))
|
||||
print(machine.succeed("/run/current-system/specialisation/newer-nix/bin/switch-to-configuration switch"))
|
||||
result = machine.succeed("nix --version")
|
||||
print(result)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user