1 files changed, 69 insertions, 226 deletions

diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index 3ded5dd7a..0397fafd2 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -25,6 +25,12 @@ import re
 import shutil
 import time
 import pexpect
+from gnunet_testing import Peer
+from gnunet_testing import Test
+from gnunet_testing import Check
+from gnunet_testing import Condition
+from gnunet_testing import * 
+ 
 
 #
 # This test tests if a fresh peer bootstraps from a hostlist server and then
@@ -38,61 +44,7 @@ import pexpect
 
 testname = "test_integration_disconnect"
 verbose = False
-gnunetarm = ""
-gnunetstatistics = ""
-success = False
-timeout = 100
-
-#test conditions
-
-
-def vprintf (msg):
-    if verbose == True:
-        print msg
-
-def setup ():
-  srcdir = "../.."
-  gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
-  if gnunet_pyexpect_dir not in sys.path:
-    sys.path.append (gnunet_pyexpect_dir)
-  from gnunet_pyexpect import pexpect
-  global gnunetarm      
-  global gnunetstatistics
-  if os.name == 'posix':
-    gnunetarm = 'gnunet-arm'
-    gnunetstatistics = 'gnunet-statistics'
-  elif os.name == 'nt':
-    gnunetarm = 'gnunet-arm.exe'
-    gnunetstatistics = 'gnunet-statistics.exe'    
-  if os.name == "nt":
-    shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
-  else:
-    shutil.rmtree ("/tmp/" + testname, True)
-
-def start ():
-        vprintf ("Starting bootstrap server & client")
-        try:
-            server = subprocess.Popen ([gnunetarm, '-sq', '-c', './confs/c_bootstrap_server.conf'])
-            server.communicate ()    
-        except OSError:
-            print "Can not start bootstrap server, exiting..."
-            exit (1)
-        try:
-            client = subprocess.Popen ([gnunetarm, '-sq', '-c', 'confs/c_no_nat_client.conf'])
-            client.communicate ()    
-        except OSError:
-            print "Can not start bootstrap client, exiting..."
-            exit (1)
-        vprintf ("Bootstrap server & client started")
-
-def stop ():
-        try:
-            client = subprocess.Popen ([gnunetarm, '-eq', '-c', 'confs/c_no_nat_client.conf'])
-            client.communicate ()    
-        except OSError:
-            print "Can not stop bootstrap client, exiting..."
-            exit (1)
-        vprintf ("Bootstrap client stopped")
+check_timeout = 30
 
 
 def cleanup ():
@@ -101,188 +53,82 @@ def cleanup ():
             shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True)
         else:
             shutil.rmtree ("/tmp/c_bootstrap_server/", True)
-            shutil.rmtree ("/tmp/c_no_nat_client/", True)
+            shutil.rmtree ("/tmp/c_no_nat_client/", True)    
 
-def check_statistics (conf, subsystem, name, value):
-    from gnunet_pyexpect import pexpect
-    server = pexpect ()
-    server.spawn (None, [gnunetstatistics, '-c', conf ,'-q','-n', name, '-s', subsystem ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    #server.expect ("stdout", re.compile (r""))
-    test = server.read("stdout", 10240)
-    if (test.find(str(value)) == -1): 
-        return False
-    else:
-        return True 
-    
-    
 
-def check_connect ():
-  server_transport_connected = False
-  server_topology_connected = False
-  server_core_connected = False
-  server_core_session_map = False
-  server_fs_connected = False
-  client_transport_connected = False
-  client_topology_connected = False
-  client_core_connected = False
-  client_core_session_map = False
-  client_fs_connected = False
-  
-  connected = False
-  count = 1
-  while ((connected == False) and (count <= timeout)):
-        # Perform checks        
-        if ((False == server_transport_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'transport', '# peers connected',1))):
-          server_transport_connected = True
-          vprintf ('Server transport services is connected')
-          
-        if ((False == client_transport_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'transport', '# peers connected',1))):
-          client_transport_connected = True
-          vprintf ('Client transport services is connected')
+def success_disconnect_cont (check):
+    global success 
+    success = True;
 
-        if ((False == server_core_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# neighbour entries allocated',1))):
-          server_core_connected = True
-          vprintf ('Server core services is connected')
-          
-        if ((False == client_core_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# neighbour entries allocated',1))):
-          client_core_connected = True
-          vprintf ('Client core services is connected')
-          
-        if ((False == client_core_session_map) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))):
-          client_core_session_map = True
-          vprintf ('Server core services is connected')
-          
-        if ((False == server_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))):
-          server_core_session_map = True
-          vprintf ('Client core notifies about connected')
 
-        if ((False == server_topology_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',1))):
-          server_topology_connected = True
-          vprintf ('Server topology services is connected')
-          
-        if ((False == client_topology_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'topology', '# peers connected',1))):
-          client_topology_connected = True
-          vprintf ('Client topology services is connected')
-          
-        if ((False == client_fs_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'fs', '# peers connected',1))):
-          client_fs_connected = True
-          vprintf ('Client fs services is connected')
-        if ((False == server_fs_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'fs', '# peers connected',1))):
-          server_fs_connected = True
-          vprintf ('Server fs services is connected')     
-            
-        # Check if conditions fulfilled
-        if ((True == client_transport_connected) and (True == server_transport_connected) and 
-        (True == client_topology_connected) and (True == server_topology_connected) and 
-        (True == client_core_connected) and (True == server_core_connected) and
-        (True == client_core_session_map) and (True == server_core_session_map) and
-        (True == client_fs_connected) and (True == server_fs_connected)):
-                connected = True
-                break 
-        print '.',
-        time.sleep(1)
-        count += 1
-  if (connected == False):
-                print ''
-                if (client_transport_connected == False):
-                        print ('Client transport was NOT connected')
-                if (server_transport_connected == False):
-                        print ('Server transport was NOT connected')
-                if (client_topology_connected == False):
-                        print ('Client topology was NOT connected')
-                if (server_topology_connected == False):
-                        print ('Server topology was NOT connected')
-                if (client_core_connected == False):
-                        print ('Client core was NOT connected')
-                if (server_core_connected == False):
-                        print ('Server core was NOT connected')
-                if (client_core_session_map == False):
-                        print ('Client core sessions did NOT increase')
-                if (server_core_session_map == False):
-                        print ('Server core sessions did NOT increase')
-                return False
-  else:
-        return True
+def fail_disconnect_cont (check):    
+    global success 
+    success = False;
+    check.eval(True)   
+  
 
 def check_disconnect ():
-        vprintf ("Shutting down bootstrap server")
-        try:
-            server = subprocess.Popen ([gnunetarm, '-eq', '-c', './confs/c_bootstrap_server.conf'])
-            server.communicate ()    
-        except OSError:
-            print "Can not stop bootstrap server, exiting..."
-            exit (1)
-            
-        client_transport_disconnected = False
-        client_topology_disconnected = False
-        client_core_disconnected = False
-        client_core_session_map = False
-        client_fs_disconnected = False
-            
-        disconnected = False
-        count = 1
-        while ((disconnected == False) and (count <= timeout)):                   
-                if ((False == client_transport_disconnected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'transport', '# peers connected',0))):
-                  client_transport_disconnected = True
-                  vprintf ('Client transport services is disconnected')
-                  
-                if ((False == client_core_disconnected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# neighbour entries allocated',0))):
-                  client_core_disconnected = True
-                  vprintf ('Client core services is disconnected')
-                  
-                if ((False == client_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# entries in session map',0))):
-                  client_core_session_map = True
-                  vprintf ('Client core notifies about disconnected')
-                  
-                if ((False == client_topology_disconnected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'topology', '# peers connected',0))):
-                  client_topology_disconnected = True
-                  vprintf ('Client topology services is disconnected')
-                  
-                if ((False == client_fs_disconnected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'fs', '# peers connected',0))):
-                  client_fs_disconnected = True
-                  vprintf ('Client fs services is disconnected')
-                    
-                # Check if conditions fulfilled
-                if ((True == client_transport_disconnected) and
-                (True == client_topology_disconnected) and 
-                (True == client_core_disconnected) and 
-                (True == client_core_session_map) and 
-                (True == client_fs_disconnected)):
-                        disconnected = True
-                        break 
-                print '.'
-                time.sleep(1)
-                count += 1
-        if (disconnected == False):
-                print ''
-                if (client_transport_disconnected == False):
-                        print ('Client transport was NOT disconnected')
-                if (client_topology_disconnected == False):
-                        print ('Client topology was NOT disconnected')
-                if (client_core_disconnected == False):
-                        print ('Client core was NOT disconnected')
-                if (client_core_session_map == False):
-                        print ('Server core sessions did NOT decrease')
-                return False
-        else:
-                return True         
+  test.p ('Shutting down bootstrap server')
+  server.stop ()
+  check = Check (test)
+  check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
+  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
+  check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
+  check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
+  check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont)
+
+
+def success_connect_cont (check):
+    check_disconnect ()
+
+
+def fail_connect_cont (check):    
+    global success 
+    success= False;
+    check.eval(True)
+
+
+def check_connect ():
+  check = Check (test)
+  check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
+  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
+  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
+  check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
+  
+  check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
+  check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
+  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
+  check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
+  
+  check.run_blocking (10, success_connect_cont, fail_connect_cont)
+
+# 
+# Test execution
+# 
 
 # 
 # Test execution
 # 
+success = False
+
+test = Test ('test_integration_disconnect', verbose)
 
-vprintf ("Running " + testname)
-setup ()
-start ()
+server = Peer(test, './confs/c_bootstrap_server.conf');
+server.start();
 
-ret = check_connect ()
-if (ret == True):
-        vprintf ('Peers connected')
-        if (True == check_disconnect ()):
-                success = True
+client = Peer(test, './confs/c_no_nat_client.conf');
+client.start();
 
-stop ()
 
+if ((client.started == True) and (server.started == True)):
+    test.p ('Peers started, running check')
+    check_connect ()
+        
+server.stop ()    
+client.stop ()
 
 cleanup ()
 
@@ -291,6 +137,3 @@ if (success == False):
         exit (1)
 else:
         exit (0)
-
-
-