X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2Ftest_integration_connection_values_tcp_udp.py.in;h=cfb10432b82b1c66a3bd3e93dc1b76e163982a30;hb=d0b4927e6ab7e8b9874dd7807055e77fb4c5163f;hp=70877cca1a3aae364facdcea3ad21d3468c73147;hpb=ed7f7c16f1f620ba6ce571c9385b5c77620d8f91;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
index 70877cca1..cfb10432b 100755
--- a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
@@ -30,7 +30,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
@@ -44,13 +43,13 @@ testname = "test_integration_connection_value"
 verbose = True
 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"), "c_normal_client"), True)
-	else:
-	    shutil.rmtree ("/tmp/c_normal_client/", True)
-
+    shutil.rmtree (os.path.join (tmp, "c_normal_client"), True)
 
 def success_cont (check):
     global success 
@@ -65,10 +64,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
 	check.reset()