# Boston, MA 02111-1307, USA.
#
#
+import signal
import sys
import os
import subprocess
import re
import shutil
import time
-import pexpect
from gnunet_testing import Peer
from gnunet_testing import Test
from gnunet_testing import Check
#definitions
testname = "test_integration_bootstrap_and_connect"
-verbose = True
-check_timeout = 30
+verbose = False
+check_timeout = 180
+if os.name == "nt":
+ tmp = os.getenv ("TEMP")
+ signals = [signal.SIGTERM, signal.SIGINT]
+else:
+ tmp = "/tmp"
+ signals = [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT]
-def cleanup ():
- if os.name == "nt":
- shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
- 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)
+def cleanup_onerror (function, path, excinfo):
+ import stat
+ if not os.path.exists (path):
+ pass
+ elif not os.access(path, os.W_OK):
+ # Is the error an access error ?
+ os.chmod (path, stat.S_IWUSR)
+ function (path)
+ else:
+ raise
+def cleanup ():
+ retries = 10
+ path = os.path.join (tmp, "c_bootstrap_server")
+ test.p ("Removing " + path)
+ while ((os.path.exists(path)) and (retries > 0)):
+ shutil.rmtree ((path), False, cleanup_onerror)
+ time.sleep (1)
+ retries -= 1
+ if (os.path.exists(path)):
+ test.p ("Failed to remove " + path)
+
+
+ retries = 10
+ path = os.path.join (tmp, "c_no_nat_client")
+ test.p ("Removing " + path)
+ while ((os.path.exists(path)) and (retries > 0)):
+ shutil.rmtree ((path), False, cleanup_onerror)
+ time.sleep (1)
+ retries -= 1
+ if (os.path.exists(path)):
+ test.p ("Failed to remove " + path)
+
def success_cont (check):
global success
success = True;
+ print 'Peers connected successfully'
def fail_cont (check):
global success
- success= False;
- check.eval(True)
+ success = False;
+ print 'Peers did not connect'
+ check.evaluate(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))
- check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+ check.add (StatisticsCondition (client, 'core', '# peers connected',1))
check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
+ check.add (StatisticsCondition (client, 'dht', '# 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, 'core', '# peers connected',1))
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
+ check.add (StatisticsCondition (server, 'dht', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
check.run_blocking (check_timeout, success_cont, fail_cont)
# Test execution
#
+def SigHandler(signum = None, frame = None):
+ global success
+ global server
+ global client
+
+ print 'Test was aborted!'
+ if (None != server):
+ server.stop ()
+ if (None != client):
+ client.stop ()
+ cleanup ()
+ sys.exit(success)
+
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');
+ global success
+ global test
+ global server
+ global client
+
+ server = None
+ client = None
+ success = False
+
+ for sig in signals:
+ signal.signal(sig, SigHandler)
- 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
+ test = Test ('test_integration_bootstrap_and_connect.py', verbose)
+ cleanup ()
+
+ server = Peer(test, './confs/c_bootstrap_server.conf');
+ client = Peer(test, './confs/c_no_nat_client.conf');
+
+ if (True != server.start()):
+ print 'Failed to start server'
+ if (None != server):
+ server.stop ()
+ if (None != server):
+ client.stop ()
+ cleanup ()
+ sys.exit(success)
+
+ # Give the server time to start
+ time.sleep(5)
+
+ if (True != client.start()):
+ print 'Failed to start client'
+ if (None != server):
+ server.stop ()
+ if (None != server):
+ client.stop ()
+ cleanup ()
+ sys.exit(success)
+
+ 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 ()
+ run ()
except (KeyboardInterrupt, SystemExit):
- print 'Test interrupted'
- server.stop ()
- client.stop ()
- cleanup ()
-sys.exit(success)
+ print 'Test interrupted'
+ server.stop ()
+ client.stop ()
+ cleanup ()
+if (success == False):
+ sys.exit(1)
+else:
+ sys.exit(0)
\ No newline at end of file
projects / oweals / gnunet.git / blobdiff