From ac01064f2f336b9903164e11450bb46d4c5c04ad Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 15 Dec 2011 17:03:59 +0000 Subject: improved tests --- src/integration-tests/gnunet_testing.py.in | 47 +- .../test_integration_bootstrap_and_connect.py.in | 15 +- .../test_integration_clique.py.in | 475 +++++---------------- .../test_integration_disconnect.py.in | 295 +++---------- 4 files changed, 222 insertions(+), 610 deletions(-) (limited to 'src/integration-tests') diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index be288ff44..3fb6221fd 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -27,9 +27,10 @@ import time class Check: - def __init__(self): + def __init__(self, test): self.fulfilled = False self.conditions = list() + self.test = test def add (self, condition): self.conditions.append(condition) def run (self): @@ -42,7 +43,7 @@ class Check: neg += 1 else: pos += 1 - print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') + self.test.p (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') return fulfilled def run_blocking (self, timeout, pos_cont, neg_cont): execs = 0; @@ -52,17 +53,37 @@ class Check: time.sleep(1) execs += 1 if (res == False): - neg_cont () + neg_cont (self) else: - pos_cont () + pos_cont (self) + def eval(self, failed_only): + pos = 0 + neg = 0 + for c in self.conditions: + if (False == c.eval (failed_only)): + neg += 1 + else: + pos += 1 + print (str(pos) +' out of '+ str (pos+neg) + ' conditions fulfilled') + return self.fulfilled + class Condition: + def __init__(self): + self.fulfilled = False + self.type = 'generic' def __init__(self, type): self.fulfilled = False self.type = type def check(self): return False; + def eval(self, failed_only): + if ((self.fulfilled == False) and (failed_only == True)): + print str(self.type) + 'condition for was ' + str(self.fulfilled) + elif (failed_only == False): + print str(self.type) + 'condition for was ' + str(self.fulfilled) + return self.fulfilled class FileExistCondition (Condition): def __init__(self, file): @@ -79,6 +100,12 @@ class FileExistCondition (Condition): return False else: return True + def eval(self, failed_only): + if ((self.fulfilled == False) and (failed_only == True)): + print str(self.type) + 'condition for file '+self.file+' was ' + str(self.fulfilled) + elif (failed_only == False): + print str(self.type) + 'condition for file '+self.file+' was ' + str(self.fulfilled) + return self.fulfilled class StatisticsCondition (Condition): def __init__(self, peer, subsystem, name, value): @@ -98,6 +125,13 @@ class StatisticsCondition (Condition): return False else: return True + def eval(self, failed_only): + if ((self.fulfilled == False) and (failed_only == True)): + print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) + elif (failed_only == False): + print str(self.type) + ' condition for value "'+str(self.value)+'" in subsystem "' + self.subsystem +'" : "' + self.name +'" was ' + str(self.fulfilled) + return self.fulfilled + class Test: def __init__(self, testname, verbose): self.verbose = verbose; @@ -120,7 +154,8 @@ class Test: else: shutil.rmtree ("/tmp/" + testname, True) def p (self, msg): - print msg + if (self.verbose == True): + print msg class Peer: def __init__(self, test, cfg_file): @@ -147,6 +182,8 @@ class Peer: self.started = True return True def stop (self): + if (self.started == False): + return False self.test.p ("Stopping peer using cfg " + self.cfg) try: server = subprocess.Popen ([self.test.gnunetarm, '-eq', '-c', self.cfg]) 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 38746544c..581179f99 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -42,8 +42,7 @@ from gnunet_testing import * #definitions testname = "test_integration_bootstrap_and_connect" -verbose = True -success = False +verbose = False timeout = 100 @@ -55,16 +54,18 @@ def cleanup (): shutil.rmtree ("/tmp/c_bootstrap_server/", True) shutil.rmtree ("/tmp/c_no_nat_client/", True) -def success (): +def success_cont (check): global success success = True; -def fail (): + +def fail_cont (check): global success success= False; + check.eval(True) def check (): - check = Check () + 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)) @@ -78,11 +79,12 @@ def check (): check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) - check.run_blocking (10, success, fail) + check.run_blocking (10, success_cont, fail_cont) # # Test execution # +success = False test = Test ('test_integration_bootstrap_and_connect.py', verbose) @@ -93,6 +95,7 @@ client = Peer(test, './confs/c_no_nat_client.conf'); client.start(); if ((client.started == True) and (server.started == True)): + test.p ('Peers started, running check') check () server.stop () diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index fbdadae12..ce254ca7b 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -31,76 +31,18 @@ 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 * + #definitions testname = "test_integration_clique" -verbose = False -gnunetarm = "" -gnunetstatistics = "" -success = False -timeout = 10 - -s_server = False; -s_c1 = False; -s_c2 = False; - -#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) - try: - client = subprocess.Popen ([gnunetarm, '-sq', '-c', 'confs/c_no_nat_client_2.conf']) - client.communicate () - except OSError: - print "Can not start bootstrap client 2, 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 1, exiting..." - exit (1) - vprintf ("Bootstrap client stopped") +verbose = True +check_timeout = 120 def cleanup (): @@ -113,335 +55,122 @@ def cleanup (): shutil.rmtree ("/tmp/c_no_nat_client/", True) shutil.rmtree ("/tmp/c_no_nat_client_2/", 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 +def success_cont (check): + global success + success = True; + +def fail_cont (check): + global success + success= False; + check.eval(True) + + +def check_disconnect_client (): + test.p ('Shutting down bootstrap client') + client.stop () + check = Check (test) - client2_transport_connected = False - client2_topology_connected = False - client2_core_connected = False - client2_core_session_map = False - client2_fs_connected = False + check.add (StatisticsCondition (client2, 'transport', '# peers connected',0)) + check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0)) + check.add (StatisticsCondition (client2, 'core', '# entries in session map',0)) + check.add (StatisticsCondition (client2, 'topology', '# peers connected',0)) + check.add (StatisticsCondition (client2, 'fs', '# peers connected',0)) - connected = False - count = 1 - while ((connected == False) and (count <= timeout)): - # Perform TRANSPORT - if ((False == server_transport_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'transport', '# peers connected',2))): - 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',2))): - client_transport_connected = True - vprintf ('Client transport services is connected') - - if ((False == client2_transport_connected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'transport', '# peers connected',2))): - client2_transport_connected = True - vprintf ('Client 2 transport services is connected') + check.run_blocking (check_timeout, success_cont, fail_cont) - # Perform TRANSPORT - if ((False == server_core_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# neighbour entries allocated',2))): - 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',2))): - client_core_connected = True - vprintf ('Client core services is connected') + +def success_disconnect_server_cont (check): + check_disconnect_client () - if ((False == client2_core_connected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'core', '# neighbour entries allocated',2))): - client2_core_connected = True - vprintf ('Client2 core services is connected') - - # Perform TRANSPORT - if ((False == server_core_session_map) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',2))): - 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',2))): - client_core_session_map = True - vprintf ('Client core notifies about connected') - if ((False == client2_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'core', '# entries in session map',2))): - client2_core_session_map = True - vprintf ('Client2 core notifies about connected') +def fail_disconnect_server_cont (check): + global success + success= False; + check.eval(True) - # Perform TRANSPORT - if ((False == server_topology_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',2))): - 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',2))): - client_topology_connected = True - vprintf ('Client topology services is connected') + +def check_disconnect_server (): + test.p ('Shutting down bootstrap server') + server.stop () + 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 (client2, 'transport', '# peers connected',1)) + check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1)) + check.add (StatisticsCondition (client2, 'core', '# entries in session map',1)) + check.add (StatisticsCondition (client2, 'topology', '# peers connected',1)) + check.add (StatisticsCondition (client2, 'fs', '# peers connected',1)) + + check.run_blocking (check_timeout, success_disconnect_server_cont, fail_disconnect_server_cont) - if ((False == client2_topology_connected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'topology', '# peers connected',2))): - client2_topology_connected = True - vprintf ('Client2 topology services is connected') - - # Perform TRANSPORT - if ((False == server_fs_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'fs', '# peers connected',2))): - server_fs_connected = True - vprintf ('Server fs services is connected') - if ((False == client_fs_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'fs', '# peers connected',2))): - client_fs_connected = True - vprintf ('Client fs services is connected') +def success_connect_cont (check): + check_disconnect_server () - if ((False == client2_fs_connected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'fs', '# peers connected',2))): - client2_fs_connected = True - vprintf ('Client2 fs services is connected') - - # Check if conditions fulfilled - if ((True == client_transport_connected) and (True == client2_transport_connected) and (True == server_transport_connected) and - (True == client_topology_connected) and (True == client2_topology_connected) and (True == server_topology_connected) and - (True == client_core_connected) and (True == client2_core_connected) and (True == server_core_connected) and - (True == client_core_session_map) and (True == client2_core_session_map) and (True == server_core_session_map) and - (True == client_fs_connected) and (True == client2_fs_connected) and (True == server_fs_connected)): - connected = True - break - print '.', - time.sleep(1) - count += 1 - if (connected == False): - print '' - if (server_transport_connected == False): - print ('Server transport was NOT connected') - if (server_topology_connected == False): - print ('Server topology was NOT connected') - if (server_core_connected == False): - print ('Server core was NOT connected') - if (server_core_session_map == False): - print ('Server core sessions did NOT increase') - - if (client_transport_connected == False): - print ('Client transport was NOT connected') - if (client_topology_connected == False): - print ('Client topology was NOT connected') - if (client_core_connected == False): - print ('Client core was NOT connected') - if (client_core_session_map == False): - print ('Client core sessions did NOT increase') - - if (client2_transport_connected == False): - print ('Client2 transport was NOT connected') - if (client2_topology_connected == False): - print ('Client2 topology was NOT connected') - if (client2_core_connected == False): - print ('Client2 core was NOT connected') - if (client2_core_session_map == False): - print ('Client2 core sessions did NOT increase') - return False - else: - return True -def check_disconnect_client (): - vprintf ("Shutting down client 2") - try: - server = subprocess.Popen ([gnunetarm, '-eq', '-c', './confs/c_no_nat_client_2.conf']) - server.communicate () - except OSError: - print "Can not stop client 2, 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 increase') - return False - else: - return True - -def check_disconnect_server (): - 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 +def fail_connect_cont (check): + global success + success= False; + check.eval(True) - client2_transport_disconnected = False - client2_topology_disconnected = False - client2_core_disconnected = False - client2_core_session_map = False - client2_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',1))): - 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',1))): - 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',1))): - 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',1))): - 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',1))): - client_fs_disconnected = True - vprintf ('Client fs services is disconnected') - if ((False == client2_transport_disconnected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'transport', '# peers connected',1))): - client2_transport_disconnected = True - vprintf ('Client2 transport services is disconnected') - - if ((False == client2_core_disconnected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'core', '# neighbour entries allocated',1))): - client2_core_disconnected = True - vprintf ('Client2 core services is disconnected') - - if ((False == client2_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'core', '# entries in session map',1))): - client2_core_session_map = True - vprintf ('Client2 core notifies about disconnected') - - if ((False == client2_topology_disconnected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'topology', '# peers connected',1))): - client2_topology_disconnected = True - vprintf ('Client2 topology services is disconnected') - - if ((False == client2_fs_disconnected) and (True == check_statistics ('./confs/c_no_nat_client_2.conf', 'fs', '# peers connected',1))): - client2_fs_disconnected = True - vprintf ('Client2 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) and - (True == client2_transport_disconnected) and - (True == client2_topology_disconnected) and - (True == client2_core_disconnected) and - (True == client2_core_session_map) and - (True == client2_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 ('Client core sessions did NOT decrease') - if (client2_transport_disconnected == False): - print ('Client2 transport was NOT disconnected') - if (client2_topology_disconnected == False): - print ('Client2 topology was NOT disconnected') - if (client2_core_disconnected == False): - print ('Client2 core was NOT disconnected') - if (client2_core_session_map == False): - print ('Client2 core sessions did NOT decrease') - return False - else: - return True +def check_connect (): + check = Check (test) + check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) + check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2)) + check.add (StatisticsCondition (client, 'core', '# entries in session map',2)) + check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) + check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) + + check.add (StatisticsCondition (client2, 'transport', '# peers connected',2)) + check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2)) + check.add (StatisticsCondition (client2, 'core', '# entries in session map',2)) + check.add (StatisticsCondition (client2, 'topology', '# peers connected',2)) + check.add (StatisticsCondition (client2, 'fs', '# peers connected',2)) + + check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) + check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2)) + check.add (StatisticsCondition (server, 'core', '# entries in session map',2)) + check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) + check.add (StatisticsCondition (server, 'fs', '# peers connected',2)) + + check.run_blocking (check_timeout, success_connect_cont, fail_connect_cont) # # Test execution # -vprintf ("Running " + testname) -setup () -start () +success = False + +test = Test ('test_integration_disconnect', verbose) -ret = check_connect () -if (ret == True): - vprintf ('Peers connected') - if (True == check_disconnect_server ()): - if (True == check_disconnect_client ()): - success = True +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 () -stop () cleanup () if (success == False): - print ('Test failed') - exit (1) + print ('Test failed') + exit (1) else: - exit (0) + exit (0) 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) - - - -- cgit v1.2.3