| test_integration_restart.py.in | test_integration_restart.py.in | |||
|---|---|---|---|---|
| skipping to change at line 46 | skipping to change at line 46 | |||
| # successfully connects to the server. When both peers are connected | # successfully connects to the server. When both peers are connected | |||
| # in transport, core, topology, fs, botth peers are shutdown and restarted | # in transport, core, topology, fs, botth peers are shutdown and restarted | |||
| # | # | |||
| # Conditions for successful exit: | # Conditions for successful exit: | |||
| # Both peers have 1 connected peer in transport, core, topology, fs after r estart | # Both peers have 1 connected peer in transport, core, topology, fs after r estart | |||
| #definitions | #definitions | |||
| testname = "test_integration_restart" | testname = "test_integration_restart" | |||
| verbose = False | verbose = False | |||
| check_timeout = 30 | check_timeout = 180 | |||
| def cleanup (): | def cleanup (): | |||
| if os.name == "nt": | 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"), "gnunet-test-fs -py-ns"), True) | |||
| shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_clien t"), True) | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_clien t"), True) | |||
| else: | else: | |||
| shutil.rmtree ("/tmp/c_bootstrap_server/", True) | shutil.rmtree ("/tmp/c_bootstrap_server/", True) | |||
| shutil.rmtree ("/tmp/c_no_nat_client/", True) | shutil.rmtree ("/tmp/c_no_nat_client/", True) | |||
| def success_restart_cont (check): | def success_restart_cont (check): | |||
| skipping to change at line 82 | skipping to change at line 82 | |||
| time.sleep(5) | time.sleep(5) | |||
| test.p ('Restarting client & server') | test.p ('Restarting client & server') | |||
| server.start () | server.start () | |||
| client.start () | client.start () | |||
| check = Check (test) | check = Check (test) | |||
| check.add (StatisticsCondition (client, 'transport', '# peers connec ted',1)) | check.add (StatisticsCondition (client, 'transport', '# peers connec ted',1)) | |||
| check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | |||
| check.add (StatisticsCondition (client, 'core', '# entries in sessio n map',1)) | check.add (StatisticsCondition (client, 'core', '# peers connected', 1)) | |||
| check.add (StatisticsCondition (client, 'topology', '# peers connect ed',1)) | check.add (StatisticsCondition (client, 'topology', '# peers connect ed',1)) | |||
| check.add (StatisticsCondition (client, 'fs', '# peers connected',1) ) | check.add (StatisticsCondition (client, 'fs', '# peers connected',1) ) | |||
| check.add (StatisticsCondition (server, 'transport', '# peers connec ted',1)) | check.add (StatisticsCondition (server, 'transport', '# peers connec ted',1)) | |||
| check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | |||
| check.add (StatisticsCondition (server, 'core', '# entries in sessio n map',1)) | check.add (StatisticsCondition (server, 'core', '# peers connected', 1)) | |||
| check.add (StatisticsCondition (server, 'topology', '# peers connect ed',1)) | check.add (StatisticsCondition (server, 'topology', '# peers connect ed',1)) | |||
| check.add (StatisticsCondition (server, 'fs', '# peers connected',1) ) | check.add (StatisticsCondition (server, 'fs', '# peers connected',1) ) | |||
| check.run_blocking (check_timeout, success_restart_cont, fail_restar t_cont) | check.run_blocking (check_timeout, success_restart_cont, fail_restar t_cont) | |||
| def fail_connect_cont (check): | def fail_connect_cont (check): | |||
| global success | global success | |||
| success= False; | success= False; | |||
| check.evaluate(True) | check.evaluate(True) | |||
| def check_connect (): | def check_connect (): | |||
| check = Check (test) | check = Check (test) | |||
| check.add (StatisticsCondition (client, 'transport', '# peers connec ted',1)) | check.add (StatisticsCondition (client, 'transport', '# peers connec ted',1)) | |||
| check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) | |||
| check.add (StatisticsCondition (client, 'core', '# entries in sessio n map',1)) | check.add (StatisticsCondition (client, 'core', '# peers connected', 1)) | |||
| check.add (StatisticsCondition (client, 'topology', '# peers connect ed',1)) | check.add (StatisticsCondition (client, 'topology', '# peers connect ed',1)) | |||
| check.add (StatisticsCondition (client, 'fs', '# peers connected',1) ) | check.add (StatisticsCondition (client, 'fs', '# peers connected',1) ) | |||
| check.add (StatisticsCondition (server, 'transport', '# peers connec ted',1)) | check.add (StatisticsCondition (server, 'transport', '# peers connec ted',1)) | |||
| check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) | |||
| check.add (StatisticsCondition (server, 'core', '# entries in sessio n map',1)) | check.add (StatisticsCondition (server, 'core', '# peers connected', 1)) | |||
| check.add (StatisticsCondition (server, 'topology', '# peers connect ed',1)) | check.add (StatisticsCondition (server, 'topology', '# peers connect ed',1)) | |||
| check.add (StatisticsCondition (server, 'fs', '# peers connected',1) ) | check.add (StatisticsCondition (server, 'fs', '# peers connected',1) ) | |||
| check.run_blocking (check_timeout, success_connect_cont, fail_connec t_cont) | check.run_blocking (check_timeout, success_connect_cont, fail_connec t_cont) | |||
| # | # | |||
| # Test execution | # Test execution | |||
| # | # | |||
| def run (): | def run (): | |||
| End of changes. 5 change blocks. | ||||
| 5 lines changed or deleted | 5 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||