added support for interupting a test

1 files changed, 44 insertions, 27 deletions

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index ce254ca7b..2c9a569f1 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -144,33 +144,50 @@ def check_connect ():
 # 
 # Test execution
 # 
-
-success = False
-
-test = Test ('test_integration_disconnect', verbose)
-
-server = Peer(test, './confs/c_bootstrap_server.conf');
-server.start();
-
-client = Peer(test, './confs/c_no_nat_client.conf');
-client.start();
-
-client2 = Peer(test, './confs/c_no_nat_client_2.conf');
-client2.start();
-
-if ((client.started == True) and (client2.started == True) and (server.started == True)):
-    test.p ('Peers started, running check')
-    check_connect ()
+def run ():
+    global test
+    global server
+    global client
+    global success
     
-server.stop ()    
-client.stop ()
-client2.stop ()
+        success = False
+        
+        test = Test ('test_integration_disconnect', verbose)
+        
+        server = Peer(test, './confs/c_bootstrap_server.conf');
+        server.start();
+        
+        client = Peer(test, './confs/c_no_nat_client.conf');
+        client.start();
+        
+        client2 = Peer(test, './confs/c_no_nat_client_2.conf');
+        client2.start();
+        
+        if ((client.started == True) and (client2.started == True) and (server.started == True)):
+            test.p ('Peers started, running check')
+            check_connect ()
+            
+        server.stop ()    
+        client.stop ()
+        client2.stop ()
+        
+        cleanup ()
+
+    if (success == False):
+        print ('Test failed')
+        return False 
+    else:
+        return True
 
-cleanup ()
-
-if (success == False):
-    print ('Test failed')
-    exit (1)
-else:
-    exit (0)
+    
+try:
+    run ()
+except (KeyboardInterrupt, SystemExit):    
+    print 'Test interrupted'
+    server.stop ()
+    client.stop ()
+    client2.stop ()
+    cleanup ()
+sys.exit(success)       
+