JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #292759 from ShamrockLee/test-references-darwin

Browse Source 
tests.references: use `runNixOSTest` instead of `nixosTest`
This commit is contained in:
Robert Hensing 2024-06-20 15:50:22 +02:00 committed by GitHub
commit cb5a0285b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/build-support/trivial-builders/test/references/default.nix
View File

@ -93,21 +93,27 @@ let
}; };
}); });
in in
testers.nixosTest { testers.runNixOSTest ({ config, lib, ... }:
name = "nixpkgs-trivial-builders"; let
nodes.machine = { ... }: { # Use the testScriptBin from guest pkgs.
# The attribute path to access the guest version of testScriptBin is
# tests.trivial-builders.references.config.node.pkgs.tests.trivial-builders.references.testScriptBin
# which is why passthru.guestTestScriptBin is provided.
guestTestScriptBin = config.node.pkgs.tests.trivial-builders.references.testScriptBin;
in
{
name = "nixpkgs-trivial-builders-references";
nodes.machine = { config, lib, pkgs, ... }: {
virtualisation.writableStore = true; virtualisation.writableStore = true;
# Test runs without network, so we don't substitute and prepare our deps # Test runs without network, so we don't substitute and prepare our deps
nix.settings.substituters = lib.mkForce [ ]; nix.settings.substituters = lib.mkForce [ ];
environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( system.extraDependencies = [ guestTestScriptBin ];
builtins.toJSON [ testScriptBin ]
);
}; };
testScript = testScript =
'' ''
machine.succeed(""" machine.succeed("""
${lib.getExe testScriptBin} 2>/dev/console ${lib.getExe guestTestScriptBin} 2>/dev/console
""") """)
''; '';
passthru = { passthru = {
@ -118,6 +124,7 @@ testers.nixosTest {
samples samples
testScriptBin testScriptBin
; ;
inherit guestTestScriptBin;
}; };
meta = { meta = {
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
@ -125,4 +132,4 @@ testers.nixosTest {
ShamrockLee ShamrockLee
]; ];
}; };
} })