cleanup service home directories since left overs can break the test

4 files changed, 5 insertions, 2 deletions

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index db4f19f17..25a1fc5dd 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -48,7 +48,7 @@ from gnunet_testing import *
 #definitions
 
 testname = "test_integration_bootstrap_and_connect"
-verbose = Verbose
+verbose = True
 check_timeout = 180
 
 if os.name == "nt":
@@ -116,6 +116,7 @@ def run ():
         
         success = False  
         test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+        cleanup ()
         
         server = Peer(test, './confs/c_bootstrap_server.conf');
         client = Peer(test, './confs/c_no_nat_client.conf');
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
index 8aa69d3f9..5391aa701 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
@@ -128,6 +128,7 @@ def run ():
         
         success = False  
         test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+        cleanup ()
         
         server = Peer(test, './confs/c_bootstrap_server.conf');
         client = Peer(test, './confs/c_no_nat_client.conf');
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
index 5fc8cf364..499889cf4 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
@@ -128,6 +128,7 @@ def run ():
         
         success = False  
         test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+        cleanup ()
         
         server = Peer(test, './confs/c_bootstrap_server.conf');
         client = Peer(test, './confs/c_nat_client.conf');
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index a14f5ac03..49a967228 100755
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -149,7 +149,7 @@ def run ():
         success = False
         
         test = Test ('test_integration_disconnect', verbose)
-        
+        cleanup ()
         server = Peer(test, './confs/c_bootstrap_server.conf');
         server.start();