b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix run-in-machine testcase + add it to the tests

Browse source
This commit is contained in:
Sander van der Burg 2013-10-02 12:06:02 +02:00
parent afdae66335
commit 1c58fbe4a9
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
release.nix
View file

@ -241,7 +241,7 @@ in {
let
testsFor = system:
mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
(import ./tests { inherit system; });
(import ./tests { inherit nixpkgs system; });
in fold recursiveUpdate {} (map testsFor systems);
}

6
tests/default.nix
View file

@ -1,4 +1,7 @@
{ system ? builtins.currentSystem, minimal ? false }:
{ nixpkgs ? <nixpkgs>
, system ? builtins.currentSystem
, minimal ? false
}:
with import ../lib/testing.nix { inherit system minimal; };
@ -30,4 +33,5 @@ with import ../lib/testing.nix { inherit system minimal; };
tomcat = makeTest (import ./tomcat.nix);
trac = makeTest (import ./trac.nix);
xfce = makeTest (import ./xfce.nix);
run-in-machine = import ./run-in-machine.nix { inherit nixpkgs system; };
}

2
tests/run-in-machine.nix
View file

@ -5,6 +5,6 @@
with import ../lib/testing.nix { inherit system; };
runInMachine {
drv = (import nixpkgs { }).aterm;
drv = (import nixpkgs { inherit system; }).aterm;
machine = { config, pkgs, ... }: { services.sshd.enable = true; };
}