[GNUnet-SVN] r18697 - gnunet/src/integration-tests

[gnunet]

Author: wachs
Date: 2011-12-19 18:10:31 +0100 (Mon, 19 Dec 2011)
New Revision: 18697

Modified:
   gnunet/src/integration-tests/Makefile.am
   gnunet/src/integration-tests/gnunet_testing.py.in
   gnunet/src/integration-tests/test_integration_disconnect.py.in
Log:
a new nat disconnect test


Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2011-12-19 16:31:33 UTC (rev 
18696)
+++ gnunet/src/integration-tests/Makefile.am    2011-12-19 17:10:31 UTC (rev 
18697)
@@ -36,6 +36,10 @@
 %.py: %.py.in Makefile
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
+       
+gnunet_testing.py: gnunet_testing.py.in Makefile
+       $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
+       chmod +x gnunet_testing.py      
 
 test_integration_bootstrap_and_connect.py: 
test_integration_bootstrap_and_connect.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > 
test_integration_bootstrap_and_connect.py
@@ -45,6 +49,10 @@
        $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > 
test_integration_disconnect.py
        chmod +x test_integration_disconnect.py
 
+test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in 
Makefile
+       $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > 
test_integration_disconnect_nat.py
+       chmod +x test_integration_disconnect_nat.py
+
 test_integration_restart.py: test_integration_restart.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_restart.py.in > 
test_integration_restart.py
        chmod +x test_integration_restart.py    
@@ -62,6 +70,7 @@
    gnunet_testing.py.in \
    test_integration_bootstrap_and_connect.py.in \
    test_integration_disconnect.py.in \
+   test_integration_disconnect_nat.py \
    test_integration_restart.py.in \ 
    test_integration_clique.py.in \
    test_integration_clique_nat.py.in

Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-19 16:31:33 UTC 
(rev 18696)
+++ gnunet/src/integration-tests/gnunet_testing.py.in   2011-12-19 17:10:31 UTC 
(rev 18697)
@@ -136,9 +136,9 @@
             fail = ""
             op = " == "
         if ((self.fulfilled == False) and (failed_only == True)):
-            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' 
+ str(self.value) + op + res + fail
+            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : 
(expected/real value) ' + str(self.value) + op + res + fail
         elif (failed_only == False): 
-            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' 
+ str(self.value) + op + res + fail 
+            print self.peer.cfg + " " + str(self.type) + ' condition in 
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : 
(expected/real value) ' + str(self.value) + op + res + fail 
         return self.fulfilled    
         
 class Test:

Modified: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in      
2011-12-19 16:31:33 UTC (rev 18696)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in      
2011-12-19 17:10:31 UTC (rev 18697)
@@ -49,7 +49,7 @@
 
 def cleanup ():
        if os.name == "nt":
-           shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"gnunet-test-fs-py-ns"), True)
+           shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"c_bootstrap_server"), True)
            shutil.rmtree (os.path.join (os.getenv ("TEMP"), 
"c_no_nat_client"), True)
        else:
            shutil.rmtree ("/tmp/c_bootstrap_server/", True)