[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22261 - gnunet/src/integration-tests
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22261 - gnunet/src/integration-tests |
|
Date: |
Mon, 25 Jun 2012 09:17:55 +0200 |
Author: grothoff
Date: 2012-06-25 09:17:55 +0200 (Mon, 25 Jun 2012)
New Revision: 22261
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
gnunet/src/integration-tests/test_integration_clique.py.in
gnunet/src/integration-tests/test_integration_clique_nat.py.in
gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
gnunet/src/integration-tests/test_integration_disconnect.py.in
gnunet/src/integration-tests/test_integration_restart.py.in
Log:
-LRN: fix integration tests
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -51,14 +51,14 @@
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_cont (check):
global success
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -51,14 +51,14 @@
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
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -51,14 +51,14 @@
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
Modified: gnunet/src/integration-tests/test_integration_clique.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique.py.in 2012-06-24
23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_clique.py.in 2012-06-25
07:17:55 UTC (rev 22261)
@@ -36,6 +36,10 @@
from gnunet_testing import Condition
from gnunet_testing import *
+if os.name == "nt":
+ tmp = os.getenv ("TEMP")
+else:
+ tmp = "/tmp"
#definitions
@@ -45,14 +49,9 @@
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):
Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -37,6 +37,10 @@
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"
@@ -45,14 +49,9 @@
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):
Modified: gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_connect_on_restart.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -45,16 +45,15 @@
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"),
"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_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):
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_connection_values_tcp.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -36,6 +36,10 @@
from gnunet_testing import Condition
from gnunet_testing import *
+if os.name == "nt":
+ tmp = os.getenv ("TEMP")
+else:
+ tmp = "/tmp"
#definitions
@@ -45,10 +49,7 @@
def cleanup ():
- if os.name == "nt":
- shutil.rmtree (os.path.join (os.getenv ("TEMP"),
"c_normal_client"), True)
- else:
- shutil.rmtree ("/tmp/c_normal_client/", True)
+ shutil.rmtree (os.path.join (tmp, "c_normal_client"), True)
def success_cont (check):
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -43,14 +43,14 @@
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"),
"c_normal_client"), True)
- else:
- shutil.rmtree ("/tmp/c_normal_client/", True)
+ shutil.rmtree (os.path.join (tmp, "c_normal_client"), True)
-
def success_cont (check):
global success
success = True;
Modified:
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++
gnunet/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -36,6 +36,10 @@
from gnunet_testing import Condition
from gnunet_testing import *
+if os.name == "nt":
+ tmp = os.getenv ("TEMP")
+else:
+ tmp = "/tmp"
#definitions
@@ -45,10 +49,7 @@
def cleanup ():
- if os.name == "nt":
- shutil.rmtree (os.path.join (os.getenv ("TEMP"),
"c_normal_client"), True)
- else:
- shutil.rmtree ("/tmp/c_normal_client/", True)
+ shutil.rmtree (os.path.join (tmp, "c_normal_client"), True)
def success_cont (check):
Modified: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in
2012-06-24 23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in
2012-06-25 07:17:55 UTC (rev 22261)
@@ -45,14 +45,14 @@
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"),
"c_bootstrap_server"), 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_disconnect_cont (check):
Modified: gnunet/src/integration-tests/test_integration_restart.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_restart.py.in 2012-06-24
23:32:15 UTC (rev 22260)
+++ gnunet/src/integration-tests/test_integration_restart.py.in 2012-06-25
07:17:55 UTC (rev 22261)
@@ -46,14 +46,14 @@
verbose = False
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_restart_cont (check):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22261 - gnunet/src/integration-tests,
gnunet <=