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

* In tests/default.nix, only import lib/testing.nix.

Browse Source 
svn path=/nixos/trunk/; revision=20483
This commit is contained in:
Eelco Dolstra 2010-03-09 10:14:45 +00:00
parent 16e7565214
commit 358f3cd79c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/testing.nix
View File

@ -5,6 +5,8 @@ with pkgs;
rec { rec {
inherit pkgs;
# Run an automated test suite in the given virtual network. # Run an automated test suite in the given virtual network.
# `network' must be the result of a call to the # `network' must be the result of a call to the

8
tests/default.nix
View File

@ -3,13 +3,7 @@
, system ? builtins.currentSystem , system ? builtins.currentSystem
}: }:
let with import ../lib/testing.nix { inherit nixpkgs services system; };
testLib =
(import ../lib/build-vms.nix { inherit nixpkgs services system; }) //
(import ../lib/testing.nix { inherit nixpkgs services system; });
in with testLib;
{ {
firefox = apply (import ./firefox.nix); firefox = apply (import ./firefox.nix);