(no commit message)

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index e98ba32426efd94b95c14b9a0ffbbe0c2e52a7dd..1e5686bf8009e8628ef532630ec37f896300287b 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -20,6 +20,7 @@ if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
  test_integration_bootstrap_and_connect.py \
  test_integration_disconnect.py \
+ test_integration_restart.py \
  test_integration_clique.py
 endif
 
@@ -42,6 +43,10 @@ test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connec
 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_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    
        
 test_integration_clique.py: test_integration_clique.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
@@ -50,7 +55,8 @@ test_integration_clique.py: test_integration_clique.py.in Makefile
 EXTRA_DIST = \
    gnunet_testing.py.in \
    test_integration_bootstrap_and_connect.py.in \
-   test_integration_disconnect.py.in \ 
+   test_integration_disconnect.py.in \
+   test_integration_restart.py.in \ 
    test_integration_clique.py.in
 
 CLEANFILES = \

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 a8aff73d773c87851fa1d14507f9f055a3feedf1..7738c72d88a735fe0b957538e91b2955202f145d 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -67,14 +67,10 @@ def success_cont (check):
     
 def fail_cont (check):    
     global success 
-    success= False;
+    success = False;
     check.eval(True)
 
 def check ():
-  global test
-  global server
-  global client
-  global success
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
@@ -96,36 +92,34 @@ def check ():
 # 
 
 def run ():
-    global test
-    global server
-    global client
-    global success
-    
-    success = False  
-    test = Test ('test_integration_bootstrap_and_connect.py', verbose)
-    
-    server = Peer(test, './confs/c_bootstrap_server.conf');
-    client = Peer(test, './confs/c_no_nat_client.conf');
-
-    server.start();
-    client.start();
-    
-    if ((client.started == True) and (server.started == True)):
-        test.p ('Peers started, running check')
-        time.sleep(5)
-        check ()
-       
-    print 'stop in run'
-    server.stop ()
-    client.stop ()
-    
-    cleanup ()
-    
-    if (success == False):
-       print ('Test failed')
-       return False 
-    else:
-       return True
+       global success
+       global test
+       global server
+       global client    
+       
+       success = False  
+       test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+       
+       server = Peer(test, './confs/c_bootstrap_server.conf');
+       client = Peer(test, './confs/c_no_nat_client.conf');
+       
+       server.start();
+       client.start();
+       
+       if ((client.started == True) and (server.started == True)):
+           test.p ('Peers started, running check')
+           time.sleep(5)
+           check ()
+       server.stop ()
+       client.stop ()
+       
+       cleanup ()
+       
+       if (success == False):
+               print ('Test failed')
+               return False 
+       else:
+               return True
 
 try:
     run ()
@@ -134,5 +128,8 @@ except (KeyboardInterrupt, SystemExit):
     server.stop ()
     client.stop ()
     cleanup ()
-sys.exit(success)    
+if (success == False):
+       sys.exit(1)   
+else:
+       sys.exit(0)    
     
\ No newline at end of file

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 2c9a569f11a509fbbdcd1aac7a8291cfcbf8cf00..faf66a7d2e0fb52d42a99cc61727150c0c32d72c 100755 (executable)
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -145,11 +145,12 @@ def check_connect ():
 # Test execution
 # 
 def run ():
-    global test
-    global server
-    global client
-    global success
-    
+       global success
+       global test
+       global server
+       global client
+       global client2  
+       
        success = False
        
        test = Test ('test_integration_disconnect', verbose)
@@ -172,12 +173,12 @@ def run ():
        client2.stop ()
        
        cleanup ()
-
-    if (success == False):
-       print ('Test failed')
-       return False 
-    else:
-       return True
+       
+       if (success == False):
+               print ('Test failed')
+               return False 
+       else:
+               return True
 
     
 try:
@@ -188,6 +189,9 @@ except (KeyboardInterrupt, SystemExit):
     client.stop ()
     client2.stop ()
     cleanup ()
-sys.exit(success)      
+if (success == False):
+       sys.exit(1)   
+else:
+       sys.exit(0)    
            
 

diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index f708aee1da54ce963050f8a67524b54ee353e82b..d055b69074a3fe0b923ec1b048f1f96023336feb 100755 (executable)
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -109,14 +109,11 @@ def check_connect ():
 # Test execution
 # 
 
-# 
-# Test execution
-# 
 def run ():
+       global success
        global test
        global server
        global client
-       global success
        
        success = False
        
@@ -152,5 +149,8 @@ except (KeyboardInterrupt, SystemExit):
     server.stop ()
     client.stop ()
     cleanup ()
-sys.exit(success)      
+if (success == False):
+       sys.exit(1)   
+else:
+       sys.exit(0)    
        
\ No newline at end of file