Author: sandervanderburg
Date: Thu Feb 24 14:31:12 2011
New Revision: 26094
URL: https://svn.nixos.org/websvn/nix/?rev=26094&sc=1
Log:
Fixed dydisnix-augment-infra implementation + added testcase
Added:
disnix/dydisnix/trunk/tests/augment.nix
Modified:
disnix/dydisnix/trunk/data/augment-infra.nix
disnix/dydisnix/trunk/release.nix
Modified: disnix/dydisnix/trunk/data/augment-infra.nix
==============================================================================
--- disnix/dydisnix/trunk/data/augment-infra.nix Thu Feb 24 14:02:35
2011 (r26093)
+++ disnix/dydisnix/trunk/data/augment-infra.nix Thu Feb 24 14:31:12
2011 (r26094)
@@ -1,5 +1,5 @@
-{infrastructure, augumentFun}:
+{infrastructure, augmentFun}:
let pkgs = import (builtins.getEnv "NIXPKGS_ALL") {};
in
-augumentFun { inherit infrastructure; inherit (pkgs) lib; }
+augmentFun { inherit infrastructure; inherit (pkgs) lib; }
Modified: disnix/dydisnix/trunk/release.nix
==============================================================================
--- disnix/dydisnix/trunk/release.nix Thu Feb 24 14:02:35 2011 (r26093)
+++ disnix/dydisnix/trunk/release.nix Thu Feb 24 14:31:12 2011 (r26094)
@@ -57,6 +57,13 @@
};
};
testScript = ''
+ # Test augment infra. For each target in the infrastructure model
+ # we add the attribute: augment = "augment". This test should
+ # succeed.
+
+ my $result =
$machine->mustSucceed("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix
dydisnix-augment-infra -i ${tests}/infrastructure.nix -a ${tests}/augment.nix");
+ $machine->mustSucceed("[
\"\$((NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix nix-instantiate
--eval-only --xml --strict $result) | grep 'augment')\" != \"\" ]");
+
# Execute filter buildable. In this situation no build exceptions
# occur, so all machines in the network are valid candidate hosts.
# This test should succeed.
Added: disnix/dydisnix/trunk/tests/augment.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ disnix/dydisnix/trunk/tests/augment.nix Thu Feb 24 14:31:12 2011
(r26094)
@@ -0,0 +1,7 @@
+{infrastructure, lib}:
+
+lib.mapAttrs (targetName: target:
+ target // {
+ augment = "augment";
+ }
+) infrastructure
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
