doxy

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

diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
index da708d8b29b529e469f68eb6c43823729a7d14e6..55982c2e4bfdaee891c13040901ce19e01023dc4 100755 (executable)
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@PYTHON@
 #    This file is part of GNUnet.
 #    (C) 2010 Christian Grothoff (and other contributing authors)
 #
@@ -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
@@ -50,16 +49,16 @@ from gnunet_testing import *
 
 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)    
+    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True)
 
 def success_server_stop_cont (check):
     global success 
@@ -71,7 +70,7 @@ def success_cont (check):
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
        check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-       check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+       check.add (StatisticsCondition (client, 'core', '# peers connected',0))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
        
@@ -86,14 +85,14 @@ 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))