diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-08 09:54:13 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-08 09:54:13 +0000 |
commit | f4f85f4858dd9abdcae52d1fb6d41cc8cc4bb7d8 (patch) | |
tree | f1fa96d9db2556601521180875c4d97227cfd1ab /src | |
parent | c53a8500e7b693a2edc785df19698720314f3dfb (diff) | |
download | gnunet-f4f85f4858dd9abdcae52d1fb6d41cc8cc4bb7d8.tar.gz gnunet-f4f85f4858dd9abdcae52d1fb6d41cc8cc4bb7d8.zip |
changes
Diffstat (limited to 'src')
-rw-r--r-- | src/integration-tests/Makefile.am | 6 | ||||
-rw-r--r-- | src/integration-tests/confs/c_bootstrap_server.conf | 2 | ||||
-rw-r--r-- | src/integration-tests/confs/c_nat_client.conf | 5 | ||||
-rw-r--r-- | src/integration-tests/confs/c_no_nat_client.conf | 2 | ||||
-rw-r--r-- | src/integration-tests/hostkeys/c_bootstrap_server (renamed from src/integration-tests/hostkeys/0000-hostkey) | bin | 827 -> 827 bytes | |||
-rw-r--r-- | src/integration-tests/hostkeys/c_nat_client (renamed from src/integration-tests/hostkeys/0002-hostkey) | bin | 826 -> 826 bytes | |||
-rw-r--r-- | src/integration-tests/hostkeys/c_no_nat_client (renamed from src/integration-tests/hostkeys/0001-hostkey) | bin | 827 -> 827 bytes | |||
-rwxr-xr-x | src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in | 22 |
8 files changed, 29 insertions, 8 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 1cce8ab1d..72a2fa9df 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -140,9 +140,9 @@ EXTRA_DIST = \ | |||
140 | confs/c_no_nat_client_http_2.conf \ | 140 | confs/c_no_nat_client_http_2.conf \ |
141 | confs/c_no_nat_client_unix.conf \ | 141 | confs/c_no_nat_client_unix.conf \ |
142 | confs/c_no_nat_client_unix_2.conf \ | 142 | confs/c_no_nat_client_unix_2.conf \ |
143 | hostkeys/0000-hostkey \ | 143 | hostkeys/c_bootstrap_server \ |
144 | hostkeys/0001-hostkey \ | 144 | hostkeys/c_no_nat_client \ |
145 | hostkeys/0002-hostkey \ | 145 | hostkeys/c_nat_client \ |
146 | hostkeys/0003-hostkey \ | 146 | hostkeys/0003-hostkey \ |
147 | hostkeys/0004-hostkey \ | 147 | hostkeys/0004-hostkey \ |
148 | hostkeys/0005-hostkey \ | 148 | hostkeys/0005-hostkey \ |
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 0dcb842cd..332cf4828 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -6,7 +6,7 @@ SERVICEHOME = /tmp/c_bootstrap_server/ | |||
6 | #HOSTKEY = hostkeys/0000-hostkey | 6 | #HOSTKEY = hostkeys/0000-hostkey |
7 | 7 | ||
8 | [PEER] | 8 | [PEER] |
9 | PRIVATE_KEY = hostkeys/0000-hostkey | 9 | PRIVATE_KEY = hostkeys/c_bootstrap_server |
10 | 10 | ||
11 | [vpn] | 11 | [vpn] |
12 | AUTOSTART = YES | 12 | AUTOSTART = YES |
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 130d4398d..3021d76ad 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -2,7 +2,10 @@ | |||
2 | SERVICEHOME = /tmp/c_nat_client | 2 | SERVICEHOME = /tmp/c_nat_client |
3 | 3 | ||
4 | [gnunetd] | 4 | [gnunetd] |
5 | HOSTKEY = hostkeys/0002-hostkey | 5 | #HOSTKEY = hostkeys/0002-hostkey |
6 | |||
7 | [PEER] | ||
8 | PRIVATE_KEY = hostkeys/c_nat_client | ||
6 | 9 | ||
7 | [client] | 10 | [client] |
8 | HOME = $SERVICEHOME | 11 | HOME = $SERVICEHOME |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index be186182c..87fef4d4f 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -6,7 +6,7 @@ SERVICEHOME = /tmp/c_no_nat_client/ | |||
6 | #HOSTKEY = hostkeys/0001-hostkey | 6 | #HOSTKEY = hostkeys/0001-hostkey |
7 | 7 | ||
8 | [PEER] | 8 | [PEER] |
9 | PRIVATE_KEY = hostkeys/0001-hostkey | 9 | PRIVATE_KEY = hostkeys/c_no_nat_client |
10 | 10 | ||
11 | [gns] | 11 | [gns] |
12 | AUTOSTART = NO | 12 | AUTOSTART = NO |
diff --git a/src/integration-tests/hostkeys/0000-hostkey b/src/integration-tests/hostkeys/c_bootstrap_server index ecc2df216..ecc2df216 100644 --- a/src/integration-tests/hostkeys/0000-hostkey +++ b/src/integration-tests/hostkeys/c_bootstrap_server | |||
Binary files differ | |||
diff --git a/src/integration-tests/hostkeys/0002-hostkey b/src/integration-tests/hostkeys/c_nat_client index e70fa3fab..e70fa3fab 100644 --- a/src/integration-tests/hostkeys/0002-hostkey +++ b/src/integration-tests/hostkeys/c_nat_client | |||
Binary files differ | |||
diff --git a/src/integration-tests/hostkeys/0001-hostkey b/src/integration-tests/hostkeys/c_no_nat_client index b6c904ca4..b6c904ca4 100644 --- a/src/integration-tests/hostkeys/0001-hostkey +++ b/src/integration-tests/hostkeys/c_no_nat_client | |||
Binary files differ | |||
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in index 55982c2e4..6fd18f5c2 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in | |||
@@ -57,8 +57,26 @@ else: | |||
57 | tmp = "/tmp" | 57 | tmp = "/tmp" |
58 | 58 | ||
59 | def cleanup (): | 59 | def cleanup (): |
60 | shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) | 60 | retries = 10 |
61 | shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) | 61 | path = os.path.join (tmp, "c_bootstrap_server") |
62 | test.p ("Removing " + path) | ||
63 | while ((os.path.exists(path)) and (retries > 0)): | ||
64 | shutil.rmtree ((path), False) | ||
65 | time.sleep (1) | ||
66 | retries -= 1 | ||
67 | if (os.path.exists(path)): | ||
68 | test.p ("Failed to remove " + path) | ||
69 | |||
70 | |||
71 | retries = 10 | ||
72 | path = os.path.join (tmp, "c_nat_client") | ||
73 | test.p ("Removing " + path) | ||
74 | while ((os.path.exists(path)) and (retries > 0)): | ||
75 | shutil.rmtree ((path), False) | ||
76 | time.sleep (1) | ||
77 | retries -= 1 | ||
78 | if (os.path.exists(path)): | ||
79 | test.p ("Failed to remove " + path) | ||
62 | 80 | ||
63 | def success_server_stop_cont (check): | 81 | def success_server_stop_cont (check): |
64 | global success | 82 | global success |