diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-13 23:42:29 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-13 23:42:29 +0100 |
commit | a2de1176e7872185a8a6b0ce7cbc93bf30f0b395 (patch) | |
tree | c5bb96fcce38d380aa488ef6babc11d679d06395 /src/integration-tests | |
parent | 5ad1c50a13484450f71e4b248f08fd2c6a369d6d (diff) | |
download | gnunet-a2de1176e7872185a8a6b0ce7cbc93bf30f0b395.tar.gz gnunet-a2de1176e7872185a8a6b0ce7cbc93bf30f0b395.zip |
trying to improve things for #5560
Diffstat (limited to 'src/integration-tests')
4 files changed, 5 insertions, 23 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index bcfa6b212..0087d8131 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -10,24 +10,15 @@ PRIVATE_KEY = hostkeys/c_bootstrap_server | |||
10 | [transport] | 10 | [transport] |
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8 | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8 |
12 | PORT = 20011 | 12 | PORT = 20011 |
13 | PLUGINS = tcp udp http_client https_client http_server https_server | 13 | PLUGINS = tcp |
14 | 14 | ||
15 | [transport-tcp] | 15 | [transport-tcp] |
16 | PORT = 20010 | 16 | PORT = 20010 |
17 | ADVERTISED_PORT = 20010 | 17 | ADVERTISED_PORT = 20010 |
18 | 18 | ||
19 | [transport-udp] | ||
20 | PORT = 20009 | ||
21 | |||
22 | [transport-http_server] | ||
23 | PORT = 20008 | ||
24 | |||
25 | [transport-https_server] | ||
26 | PORT = 20007 | ||
27 | |||
28 | [hostlist] | 19 | [hostlist] |
29 | OPTIONS = -p | 20 | OPTIONS = -p |
30 | SERVERs = | 21 | SERVERs = |
31 | 22 | ||
32 | [nat] | 23 | [nat] |
33 | BEHIND_NAT = NO | 24 | BEHIND_NAT = NO |
@@ -94,6 +85,3 @@ PORT = 20001 | |||
94 | [nse] | 85 | [nse] |
95 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12 | 86 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12 |
96 | PORT = 20015 | 87 | PORT = 20015 |
97 | |||
98 | |||
99 | |||
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 0040a8dc0..8ec2c60a0 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -10,7 +10,7 @@ PRIVATE_KEY = hostkeys/c_nat_client | |||
10 | [transport] | 10 | [transport] |
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 |
12 | PORT = 20065 | 12 | PORT = 20065 |
13 | PLUGINS = tcp udp http_client https_client | 13 | PLUGINS = tcp |
14 | 14 | ||
15 | [transport-tcp] | 15 | [transport-tcp] |
16 | PORT = 0 | 16 | PORT = 0 |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 38a7d7fbc..16e514b96 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -7,7 +7,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/c_no_nat_client/ | |||
7 | PRIVATE_KEY = hostkeys/c_no_nat_client | 7 | PRIVATE_KEY = hostkeys/c_no_nat_client |
8 | 8 | ||
9 | [transport] | 9 | [transport] |
10 | PLUGINS = tcp udp http_client https_client | 10 | PLUGINS = tcp |
11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 | 11 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 |
12 | PORT = 20029 | 12 | PORT = 20029 |
13 | 13 | ||
@@ -15,10 +15,6 @@ PORT = 20029 | |||
15 | PORT = 20028 | 15 | PORT = 20028 |
16 | ADVERTISED_PORT = 20028 | 16 | ADVERTISED_PORT = 20028 |
17 | 17 | ||
18 | [transport-udp] | ||
19 | PORT = 20027 | ||
20 | BROADCAST_INTERVAL = 30 s | ||
21 | |||
22 | [hostlist] | 18 | [hostlist] |
23 | SERVERS = http://localhost:8080/ | 19 | SERVERS = http://localhost:8080/ |
24 | 20 | ||
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 6c8f07632..cd952e36c 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
@@ -8,7 +8,7 @@ PRIVATE_KEY = hostkeys/c_no_nat_client_2 | |||
8 | 8 | ||
9 | 9 | ||
10 | [transport] | 10 | [transport] |
11 | PLUGINS = tcp udp http_client https_client | 11 | PLUGINS = tcp |
12 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 | 12 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 |
13 | PORT = 20039 | 13 | PORT = 20039 |
14 | 14 | ||
@@ -111,5 +111,3 @@ PORT = 20038 | |||
111 | [dv] | 111 | [dv] |
112 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36 | 112 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36 |
113 | PORT = 20039 | 113 | PORT = 20039 |
114 | |||
115 | |||