[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18627 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18627 - gnunet/src/integration-tests |
Date: |
Fri, 16 Dec 2011 13:25:28 +0100 |
Author: wachs
Date: 2011-12-16 13:25:28 +0100 (Fri, 16 Dec 2011)
New Revision: 18627
Modified:
gnunet/src/integration-tests/gnunet_testing.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
gnunet/src/integration-tests/test_integration_clique.py.in
gnunet/src/integration-tests/test_integration_disconnect.py.in
Log:
added support for interupting a test
Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in 2011-12-16 12:10:03 UTC
(rev 18626)
+++ gnunet/src/integration-tests/gnunet_testing.py.in 2011-12-16 12:25:28 UTC
(rev 18627)
@@ -134,6 +134,7 @@
class Test:
def __init__(self, testname, verbose):
+ self.peers = list()
self.verbose = verbose;
self.name = testname;
srcdir = "../.."
@@ -153,6 +154,8 @@
shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
else:
shutil.rmtree ("/tmp/" + testname, True)
+ def add_peer (peer):
+ self.conditions.append(condition)
def p (self, msg):
if (self.verbose == True):
print msg
@@ -167,9 +170,12 @@
def __del__(self):
if (self.started == True):
print 'ERROR! Peer using cfg ' + self.cfg + ' was not stopped'
+ if (ret == self.stop ()):
+ print 'ERROR! Peer using cfg ' + self.cfg + ' could not
be stopped'
self.started == False
- if (False == self.stop ()):
- print 'ERROR! Peer using cfg ' + self.cfg + ' could not
be stopped'
+ return ret
+ else:
+ return False
def start (self):
self.test.p ("Starting peer using cfg " + self.cfg)
try:
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2011-12-16 12:10:03 UTC (rev 18626)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2011-12-16 12:25:28 UTC (rev 18627)
@@ -39,11 +39,18 @@
# Conditions for successful exit:
# Both peers have 1 connected peer in transport, core, topology, fs
+#
+# This test tests if a fresh peer bootstraps from a hostlist server and then
+# successfully connects to the server
+#
+# Conditions for successful exit:
+# Both peers have 1 connected peer in transport, core, topology, fs
+
#definitions
testname = "test_integration_bootstrap_and_connect"
-verbose = False
-timeout = 100
+verbose = True
+check_timeout = 30
def cleanup ():
@@ -64,7 +71,10 @@
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))
@@ -79,32 +89,50 @@
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
- check.run_blocking (10, success_cont, fail_cont)
+ check.run_blocking (check_timeout, success_cont, fail_cont)
#
# Test execution
#
-success = False
-test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+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 = Peer(test, './confs/c_bootstrap_server.conf');
-server.start();
+ 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
-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 ()
-client.stop ()
-
-cleanup ()
-
-if (success == False):
- print ('Test failed')
- exit (1)
-else:
- exit (0)
+try:
+ run ()
+except (KeyboardInterrupt, SystemExit):
+ print 'Test interrupted'
+ server.stop ()
+ client.stop ()
+ cleanup ()
+sys.exit(success)
+
\ No newline at end of file
Modified: gnunet/src/integration-tests/test_integration_clique.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique.py.in 2011-12-16
12:10:03 UTC (rev 18626)
+++ gnunet/src/integration-tests/test_integration_clique.py.in 2011-12-16
12:25:28 UTC (rev 18627)
@@ -144,33 +144,50 @@
#
# Test execution
#
+def run ():
+ global test
+ global server
+ global client
+ global success
+
+ 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 ()
-success = False
+ if (success == False):
+ print ('Test failed')
+ return False
+ else:
+ return True
-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 ()
+try:
+ run ()
+except (KeyboardInterrupt, SystemExit):
+ print 'Test interrupted'
+ server.stop ()
+ client.stop ()
+ client2.stop ()
+ cleanup ()
+sys.exit(success)
+
-cleanup ()
-
-if (success == False):
- print ('Test failed')
- exit (1)
-else:
- exit (0)
-
Modified: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in
2011-12-16 12:10:03 UTC (rev 18626)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in
2011-12-16 12:25:28 UTC (rev 18627)
@@ -43,7 +43,7 @@
#definitions
testname = "test_integration_disconnect"
-verbose = False
+verbose = True
check_timeout = 30
@@ -112,28 +112,45 @@
#
# Test execution
#
-success = False
+def run ():
+ global test
+ global server
+ global client
+ global success
+
+ 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();
+
+
+ if ((client.started == True) and (server.started == True)):
+ test.p ('Peers started, running check')
+ check_connect ()
+
+ server.stop ()
+ client.stop ()
+
+ cleanup ()
+
+ if (success == False):
+ print ('Test failed')
+ return True
+ else:
+ return 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();
-
-
-if ((client.started == True) and (server.started == True)):
- test.p ('Peers started, running check')
- check_connect ()
-server.stop ()
-client.stop ()
-
-cleanup ()
-
-if (success == False):
- print ('Test failed')
- exit (1)
-else:
- exit (0)
+try:
+ run ()
+except (KeyboardInterrupt, SystemExit):
+ print 'Test interrupted'
+ server.stop ()
+ client.stop ()
+ cleanup ()
+sys.exit(success)
+
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18627 - gnunet/src/integration-tests,
gnunet <=