Imported Upstream version 0.9.5aupstream

1 files changed, 7 insertions, 9 deletions

diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 65c9341..6c7a5d7 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):