summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-12-19 17:10:31 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-12-19 17:10:31 +0000
commitb10b45c398e1da19723c368d6ddd3641e2a97a79 (patch)
treeffd27da252792b30db4f601b4a1cb78e3d11c278
parent2088429445cccbb5b5ac8d696e5544853bb60396 (diff)
a new nat disconnect test
-rw-r--r--src/integration-tests/Makefile.am9
-rw-r--r--src/integration-tests/gnunet_testing.py.in4
-rwxr-xr-xsrc/integration-tests/test_integration_disconnect.py.in2
3 files changed, 12 insertions, 3 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index b9f6b4c56..91de4ae5b 100644
--- 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 cb3dc541f..9d4a32877 100644
--- 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 537ae86bf..4c08289f5 100755
--- 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)