X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2Ftest_integration_clique_nat.py.in;h=a457e8d8395e08a6b733f5bf7e79aa97595d607e;hb=a5750919060a5ca7a6367e1d95a68a852a555056;hp=59d117949dc640141c975dd02e6a3552606cba25;hpb=ced6bf19685b9c9af19da50a021ca8ff169e7c77;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in
index 59d117949..a457e8d83 100755
--- a/src/integration-tests/test_integration_clique_nat.py.in
+++ b/src/integration-tests/test_integration_clique_nat.py.in
@@ -31,13 +31,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
 testname = "test_integration_clique_nat"
@@ -46,14 +49,9 @@ check_timeout = 180
 
 
 def cleanup ():
-	if os.name == "nt":
-	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_bootstrap_server"), True)
-	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True)
-	    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_nat_client"), True)
-	else:
-	    shutil.rmtree ("/tmp/c_bootstrap_server/", True)
-	    shutil.rmtree ("/tmp/c_no_nat_client/", True)
-	    shutil.rmtree ("/tmp/c_nat_client/", 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_nat_client"), True)
 
 
 def success_cont (check):