improved test framework

4 files changed, 57 insertions, 182 deletions

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index a40fa76e6..e98ba3242 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -13,6 +13,8 @@ bin_PROGRAMS =
 
 check_PROGRAMS =
 
+noinst_SCRIPTS = \
+ gnunet_testing.py
 
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
@@ -29,6 +31,10 @@ endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
+%.py: %.py.in Makefile
+	$(do_subst) < $(srcdir)/$< > $@
+	chmod +x $@
+
 test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
 	$(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
 	chmod +x test_integration_bootstrap_and_connect.py
@@ -42,9 +48,11 @@ test_integration_clique.py: test_integration_clique.py.in Makefile
 	chmod +x test_integration_clique.py	
 
 EXTRA_DIST = \
+   gnunet_testing.py.in \
    test_integration_bootstrap_and_connect.py.in \
    test_integration_disconnect.py.in \ 
    test_integration_clique.py.in
 
-
-CLEANFILES = $(check_SCRIPTS)
+CLEANFILES = \
+	$(check_SCRIPTS) \
+	gnunet_testing.py
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index dccaf43eb..be288ff44 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -86,10 +86,11 @@ class StatisticsCondition (Condition):
         self.type = 'statistics'
         self.peer = peer;
         self.subsystem = subsystem;
-        self.name = value;
+        self.name = name;
+        self.value = value;
     def check(self):
         if (self.fulfilled == False):
-            res = self.peer.check (subsystem, name, value);
+            res = self.peer.check (self.subsystem, self.name, self.value);
             if (res == True):
                 self.fulfilled = True
                 return True
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 57184fc61..38746544c 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.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
@@ -36,82 +42,10 @@ import pexpect
 #definitions
 
 testname = "test_integration_bootstrap_and_connect"
-verbose = False
-gnunetarm = ""
-gnunetstatistics = ""
+verbose = True
 success = False
 timeout = 100
 
-#test conditions
-
-#server
-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
-
-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 ():
-	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)
-	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 server & client stopped")
-
 
 def cleanup ():
 	if os.name == "nt":
@@ -119,120 +53,51 @@ 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 success ():
+    global success
+    success = True;
+def fail ():    
+    global success 
+    success= False;
 
 def check ():
-  global success
-  global timeout
-  global publish
-  global server_transport_connected
-  global server_topology_connected
-  global server_core_connected
-  global server_core_session_map
-  global server_fs_connected
   
-  global client_transport_connected
-  global client_topology_connected
-  global client_core_connected
-  global client_core_session_map
-  global client_fs_connected
-
-  count = 1
-  while ((success == 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')
-
-	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 == server_core_session_map) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))):
-	  server_core_session_map = True
-	  vprintf ('Server core services is connected')
-	  
-	if ((False == client_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))):
-	  client_core_session_map = True
-	  vprintf ('Client core notifies about connected')
+  check = Check ()
+  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))
+  
 
-	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)):
-		success = True
-		break 
-	print '.',
-	time.sleep(1)
-	count += 1
-  if (success == 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')
+  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, fail)
 
 # 
 # Test execution
 # 
 
-vprintf ("Running " + testname)
-setup ()
-start ()
+test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+
+server = Peer(test, './confs/c_bootstrap_server.conf');
+server.start();
 
-check ()
+client = Peer(test, './confs/c_no_nat_client.conf');
+client.start();
+
+if ((client.started == True) and (server.started == True)):
+    check ()
+	
+server.stop ()
+client.stop ()
 
-stop ()
 cleanup ()
 
 if (success == False):
@@ -240,6 +105,3 @@ if (success == False):
 	exit (1)
 else:
 	exit (0)
-
-
-
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 0b4a8550a..fbdadae12 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -41,6 +41,10 @@ gnunetstatistics = ""
 success = False
 timeout = 10
 
+s_server = False;
+s_c1 = False;
+s_c2 = False;
+
 #test conditions