diff options
Diffstat (limited to 'src/integration-tests/test_integration_clique_nat.py.in')
-rwxr-xr-x | src/integration-tests/test_integration_clique_nat.py.in | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in index 59d1179..a457e8d 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): |