move functions to lib/testing to allow easier use outside of nixos

svn path=/nixos/trunk/; revision=20072

1 files changed, 15 insertions, 1 deletions

diff --git a/lib/testing.nix b/lib/testing.nix
index 834fa04ec0b0..1b0c3889190e 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -80,5 +80,19 @@ rec {
       ensureDir $out/nix-support
       echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
     ''; # */
-    
+
+  call = f: f { inherit pkgs nixpkgs system; };
+
+  apply = testFun: complete (call testFun);
+
+  complete = t: t // rec {
+    nodes =
+      if t ? nodes then t.nodes else
+      if t ? machine then { machine = t.machine; }
+      else { };
+    vms = buildVirtualNetwork { inherit nodes; };
+    test = runTests vms t.testScript;
+    report = makeReport test;
+  };
+   
 }