a new nat disconnect test

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index b9f6b4c5603a809c400bd71ad68dbd93cd60d3d1..91de4ae5b9f9c6d505258024d49cf6befd303ebc 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -36,6 +36,10 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 %.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 @@ test_integration_disconnect.py: test_integration_disconnect.py.in Makefile
        $(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 @@ EXTRA_DIST = \
    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

diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index cb3dc541f2fe2aa3872370b7a184894ff3b39f41..9d4a328770cd2498cae46b5237b486c1791b2a98 100644 (file)
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -136,9 +136,9 @@ class StatisticsCondition (Condition):
             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:

diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index 537ae86bfbb7bd54fa96d17b3bb00b4ea932b7d1..4c08289f5a00fd2eb4da6df8a3e488e78049aa47 100755 (executable)
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -49,7 +49,7 @@ check_timeout = 30
 
 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)