From 31c11f6c1934bcef07e12055dc9d0484957bd5d5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 25 Jun 2012 07:17:55 +0000 Subject: -LRN: fix integration tests --- ...st_integration_bootstrap_and_connect_and_disconnect.py.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in') diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in index 76e69b7cb..3ca0aea86 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in @@ -51,14 +51,14 @@ testname = "test_integration_bootstrap_and_connect" 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"), "gnunet-test-fs-py-ns"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_server_stop_cont (check): global success -- cgit v1.2.3