X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2Ftest_integration_clique.py.in;h=6c7a5d770e9c0a1dd4e1ffd16192e6457309ce6b;hb=d0b4927e6ab7e8b9874dd7807055e77fb4c5163f;hp=82a406d0b73fa654ff6ab785114d96b0ec72d901;hpb=ed7f7c16f1f620ba6ce571c9385b5c77620d8f91;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 82a406d0b..6c7a5d770 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -30,13 +30,16 @@ 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
 from gnunet_testing import Condition
 from gnunet_testing import * 
  
+if os.name == "nt":
+  tmp = os.getenv ("TEMP")
+else:
+  tmp = "/tmp"
 
 #definitions
 
@@ -46,14 +49,9 @@ check_timeout = 180
 
 
 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)
-	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client_2"), True)
-	else:
-	    shutil.rmtree ("/tmp/c_bootstrap_server/", True)
-	    shutil.rmtree ("/tmp/c_no_nat_client/", True)
-	    shutil.rmtree ("/tmp/c_no_nat_client_2/", True)
+    shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True)
+    shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True)
 
 
 def success_cont (check):
@@ -73,7 +71,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -96,13 +94,13 @@ def check_disconnect_server ():
   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 (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -123,19 +121,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))