import re
import shutil
import time
-import pexpect
from gnunet_testing import Peer
from gnunet_testing import Test
from gnunet_testing import Check
testname = "test_integration_bootstrap_and_connect"
verbose = True
-check_timeout = 30
+check_timeout = 180
+if os.name == "nt":
+ tmp = os.getenv ("TEMP")
+else:
+ tmp = "/tmp"
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)
-
+ 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)
+ 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)
+ time.sleep (1)
+ retries -= 1
+ if (os.path.exists(path)):
+ test.p ("Failed to remove " + path)
+
def success_cont (check):
global success
success = True;
def fail_cont (check):
global success
success = False;
- check.eval(True)
+ check.evaluate(True)
def 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))
+ check.add (StatisticsCondition (client, 'core', '# peers connected',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, 'core', '# peers connected',1))
check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
success = False
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');
- server.start();
- client.start();
+ assert (True == server.start());
+ assert (True == client.start());
if ((client.started == True) and (server.started == True)):
- test.p ('Peers started, running check')
- time.sleep(5)
- check ()
+ test.p ('Peers started, running check')
+ time.sleep(5)
+ check ()
server.stop ()
client.stop ()
return True
try:
- run ()
+ run ()
except (KeyboardInterrupt, SystemExit):
- print 'Test interrupted'
- server.stop ()
- client.stop ()
- cleanup ()
+ print 'Test interrupted'
+ server.stop ()
+ client.stop ()
+ cleanup ()
if (success == False):
sys.exit(1)
else: