fixing invalid hostkeys

[oweals/gnunet.git] / src / integration-tests / test_integration_restart.py.in

diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index e2a72e7291d033417f92d257210a4350134dfb0c..b3d3ecd18606338292e76a7c869e22f6b790d7e8 100755 (executable)
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -24,7 +24,6 @@ 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
@@ -45,16 +44,16 @@ from gnunet_testing import *
 
 testname = "test_integration_restart"
 verbose = False
-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)    
+    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True)
 
 
 def success_restart_cont (check):
@@ -85,13 +84,13 @@ def success_connect_cont (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))  
        
@@ -108,13 +107,13 @@ 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, '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))