aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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'
36%.py: %.py.in Makefile 36%.py: %.py.in Makefile
37 $(do_subst) < $(srcdir)/$< > $@ 37 $(do_subst) < $(srcdir)/$< > $@
38 chmod +x $@ 38 chmod +x $@
39
40gnunet_testing.py: gnunet_testing.py.in Makefile
41 $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
42 chmod +x gnunet_testing.py
39 43
40test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile 44test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
41 $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py 45 $(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
45 $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py 49 $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py
46 chmod +x test_integration_disconnect.py 50 chmod +x test_integration_disconnect.py
47 51
52test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile
53 $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py
54 chmod +x test_integration_disconnect_nat.py
55
48test_integration_restart.py: test_integration_restart.py.in Makefile 56test_integration_restart.py: test_integration_restart.py.in Makefile
49 $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py 57 $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py
50 chmod +x test_integration_restart.py 58 chmod +x test_integration_restart.py
@@ -62,6 +70,7 @@ EXTRA_DIST = \
62 gnunet_testing.py.in \ 70 gnunet_testing.py.in \
63 test_integration_bootstrap_and_connect.py.in \ 71 test_integration_bootstrap_and_connect.py.in \
64 test_integration_disconnect.py.in \ 72 test_integration_disconnect.py.in \
73 test_integration_disconnect_nat.py \
65 test_integration_restart.py.in \ 74 test_integration_restart.py.in \
66 test_integration_clique.py.in \ 75 test_integration_clique.py.in \
67 test_integration_clique_nat.py.in 76 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):
136 fail = "" 136 fail = ""
137 op = " == " 137 op = " == "
138 if ((self.fulfilled == False) and (failed_only == True)): 138 if ((self.fulfilled == False) and (failed_only == True)):
139 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + res + fail 139 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
140 elif (failed_only == False): 140 elif (failed_only == False):
141 print self.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : ' + str(self.value) + op + res + fail 141 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
142 return self.fulfilled 142 return self.fulfilled
143 143
144class Test: 144class 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
49 49
50def cleanup (): 50def cleanup ():
51 if os.name == "nt": 51 if os.name == "nt":
52 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) 52 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_bootstrap_server"), True)
53 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) 53 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True)
54 else: 54 else:
55 shutil.rmtree ("/tmp/c_bootstrap_server/", True) 55 shutil.rmtree ("/tmp/c_bootstrap_server/", True)