diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-25 07:17:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-25 07:17:55 +0000 |
commit | 31c11f6c1934bcef07e12055dc9d0484957bd5d5 (patch) | |
tree | cd08eae7afebfa8fd774ce61282a5c56800fed0b /src/integration-tests/test_integration_clique.py.in | |
parent | bb0b87bf4c34d550f5fa1679fd25279e3921a949 (diff) | |
download | gnunet-31c11f6c1934bcef07e12055dc9d0484957bd5d5.tar.gz gnunet-31c11f6c1934bcef07e12055dc9d0484957bd5d5.zip |
-LRN: fix integration tests
Diffstat (limited to 'src/integration-tests/test_integration_clique.py.in')
-rwxr-xr-x | src/integration-tests/test_integration_clique.py.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 7c3fdd8a9..6c7a5d770 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
@@ -36,6 +36,10 @@ from gnunet_testing import Check | |||
36 | from gnunet_testing import Condition | 36 | from gnunet_testing import Condition |
37 | from gnunet_testing import * | 37 | from gnunet_testing import * |
38 | 38 | ||
39 | if os.name == "nt": | ||
40 | tmp = os.getenv ("TEMP") | ||
41 | else: | ||
42 | tmp = "/tmp" | ||
39 | 43 | ||
40 | #definitions | 44 | #definitions |
41 | 45 | ||
@@ -45,14 +49,9 @@ check_timeout = 180 | |||
45 | 49 | ||
46 | 50 | ||
47 | def cleanup (): | 51 | def cleanup (): |
48 | if os.name == "nt": | 52 | shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) |
49 | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) | 53 | shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) |
50 | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) | 54 | shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True) |
51 | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client_2"), True) | ||
52 | else: | ||
53 | shutil.rmtree ("/tmp/c_bootstrap_server/", True) | ||
54 | shutil.rmtree ("/tmp/c_no_nat_client/", True) | ||
55 | shutil.rmtree ("/tmp/c_no_nat_client_2/", True) | ||
56 | 55 | ||
57 | 56 | ||
58 | def success_cont (check): | 57 | def success_cont (check): |