[Nix-commits] SVN commit: nix - r23749 - disnix/disnix/trunk

[Sander van der Burg]

Author: sandervanderburg
Date: Mon Sep 13 14:21:35 2010
New Revision: 23749
URL: https://svn.nixos.org/websvn/nix/?rev=23749&sc=1

Log:
A bit more clarification on the testcases

Modified:
   disnix/disnix/trunk/release.nix

Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix     Mon Sep 13 13:43:53 2010        (r23748)
+++ disnix/disnix/trunk/release.nix     Mon Sep 13 14:21:35 2010        (r23749)
@@ -171,6 +171,8 @@
              
$client->mustFail("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix 
disnix-manifest -s ${manifestTests}/services-complete.nix -i 
${manifestTests}/infrastructure.nix -d 
${manifestTests}/distribution-incomplete.nix");
              
              #### Test disnix-client / dbus-service
+             
+             # Check invalid path
                              
              my $result = $client->mustSucceed("disnix-client --print-invalid 
/nix/store/invalid");
              
@@ -180,11 +182,15 @@
                  die "/nix/store/invalid should be invalid\n";
              }
                      
+             # Lock/unlock test
+             
              $client->mustSucceed("disnix-client --lock");
              $client->mustFail("disnix-client --lock");
              $client->mustSucceed("disnix-client --unlock");
              $client->mustFail("disnix-client --unlock");
              
+             # Activation/deactivation test
+             
              my @closure = split('\n', $client->mustSucceed("nix-store -qR 
$manifest"));
              my @testService1 = grep(/\-testService1/, @closure);
              
@@ -205,7 +211,7 @@
               $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
               $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
              
-             # Run test-cases
+             # Print invalid test
              
              my $result = $client->mustSucceed("SSH_OPTS='-o 
UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' disnix-ssh-client 
--target server --print-invalid /nix/store/invalid");
              
@@ -215,15 +221,17 @@
                  die "/nix/store/invalid should be invalid\n";
              }
              
+             # Lock/unlock test
              $client->mustSucceed("SSH_OPTS='-o UserKnownHostsFile=/dev/null 
-o StrictHostKeyChecking=no' disnix-ssh-client --target server --lock");
              $client->mustFail("SSH_OPTS='-o UserKnownHostsFile=/dev/null -o 
StrictHostKeyChecking=no' disnix-ssh-client --target server --lock");
              $client->mustSucceed("SSH_OPTS='-o UserKnownHostsFile=/dev/null 
-o StrictHostKeyChecking=no' disnix-ssh-client --target server --unlock");
              $client->mustFail("SSH_OPTS='-o UserKnownHostsFile=/dev/null -o 
StrictHostKeyChecking=no' disnix-ssh-client --target server --unlock");
              
+             # Activate/deactivate test
              $client->mustSucceed("SSH_OPTS='-o UserKnownHostsFile=/dev/null 
-o StrictHostKeyChecking=no' disnix-ssh-client --target server --activate 
--arguments foo=foo --arguments bar=bar --type echo @testService1");
              $client->mustSucceed("SSH_OPTS='-o UserKnownHostsFile=/dev/null 
-o StrictHostKeyChecking=no' disnix-ssh-client --target server --deactivate 
--arguments foo=foo --arguments bar=bar --type echo @testService1");
              
-             #### Test copy closure
+             # Test copy closure
              
              $server->mustFail("nix-store --check-validity @testService1");
              $client->mustSucceed("SSH_OPTS='-o UserKnownHostsFile=/dev/null 
-o StrictHostKeyChecking=no' disnix-copy-closure --interface disnix-ssh-client 
--target server --to @testService1");
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits