aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-02 08:22:27 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-02 08:22:27 +0000
commit50d29f1c62f82f9d1b7660413513ba61e4e9840e (patch)
treeb99ac04c737f2c20b1c4b60048d338ba7199e794 /src/testing
parenta4d1b91e10f34c667b91e188b0b860483223fd3a (diff)
downloadgnunet-50d29f1c62f82f9d1b7660413513ba61e4e9840e.tar.gz
gnunet-50d29f1c62f82f9d1b7660413513ba61e4e9840e.zip
simplify
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test_testing_connect_peer1.conf1
-rw-r--r--src/testing/test_testing_connect_peer2.conf1
-rw-r--r--src/testing/test_testing_data_remote.conf11
-rw-r--r--src/testing/test_testing_data_topology_2d_torus.conf9
-rw-r--r--src/testing/test_testing_data_topology_blacklist.conf9
-rw-r--r--src/testing/test_testing_data_topology_churn.conf12
-rw-r--r--src/testing/test_testing_data_topology_clique.conf15
-rw-r--r--src/testing/test_testing_data_topology_clique_dfs.conf12
-rw-r--r--src/testing/test_testing_data_topology_clique_minimum.conf12
-rw-r--r--src/testing/test_testing_data_topology_clique_random.conf12
-rw-r--r--src/testing/test_testing_data_topology_erdos_renyi.conf9
-rw-r--r--src/testing/test_testing_data_topology_internat.conf9
-rw-r--r--src/testing/test_testing_data_topology_none.conf13
-rw-r--r--src/testing/test_testing_data_topology_ring.conf9
-rw-r--r--src/testing/test_testing_data_topology_scale_free.conf12
-rw-r--r--src/testing/test_testing_data_topology_small_world_ring.conf9
-rw-r--r--src/testing/test_testing_data_topology_small_world_torus.conf9
-rw-r--r--src/testing/test_testing_data_topology_stability.conf12
-rw-r--r--src/testing/test_testing_defaults.conf1
-rw-r--r--src/testing/test_testing_peergroup_data.conf3
20 files changed, 2 insertions, 178 deletions
diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 7c5cb549d..70de8fcd6 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -5,7 +5,6 @@ DEFAULTCONFIG = test_testing_connect_peer1.conf
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 12568 7PORT = 12568
8BINDTO = 127.0.0.1
9 8
10[arm] 9[arm]
11PORT = 12566 10PORT = 12566
diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 301ad0d47..a7a49c5a8 100644
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -5,7 +5,6 @@ DEFAULTCONFIG = test_testing_connect_peer2.conf
5 5
6[transport-tcp] 6[transport-tcp]
7PORT = 22568 7PORT = 22568
8BINDTO = 127.0.0.1
9 8
10[arm] 9[arm]
11PORT = 22566 10PORT = 22566
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 1d527b7f7..d58666f31 100644
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -3,19 +3,10 @@
3DEFAULTCONFIG = test_testing_data_remote.conf 3DEFAULTCONFIG = test_testing_data_remote.conf
4 4
5[TESTING] 5[TESTING]
6CONTROL_HOST = 131.159.20.42 6CONTROL_HOST = 127.0.0.1
7HOSTFILE = remote_hosts.txt 7HOSTFILE = remote_hosts.txt
8MAX_OUTSTANDING_SSH = 5 8MAX_OUTSTANDING_SSH = 5
9 9
10[statistics] 10[statistics]
11AUTOSTART = NO 11AUTOSTART = NO
12 12
13[datastore]
14AUTOSTART = YES
15
16[fs]
17AUTOSTART = YES
18
19[mesh]
20AUTOSTART = YES
21
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 5f7a14f7a..45fd69040 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -6,12 +6,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
6NUM_PEERS = 13 6NUM_PEERS = 13
7TOPOLOGY = 2D_TORUS 7TOPOLOGY = 2D_TORUS
8 8
9[datastore]
10AUTOSTART = YES
11
12[fs]
13AUTOSTART = YES
14
15[mesh]
16AUTOSTART = YES
17
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index 7d2018df3..36e378d42 100644
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -11,12 +11,3 @@ BLACKLIST_TRANSPORTS = tcp udp http
11[transport-udp] 11[transport-udp]
12PORT = 2568 12PORT = 2568
13 13
14[datastore]
15AUTOSTART = YES
16
17[fs]
18AUTOSTART = YES
19
20[mesh]
21AUTOSTART = YES
22
diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index bd79d2e4f..b3371658d 100644
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -5,18 +5,6 @@ DEFAULTCONFIG = test_testing_data_topology_churn.conf
5[TESTING] 5[TESTING]
6NUM_PEERS = 12 6NUM_PEERS = 12
7 7
8[transport-udp]
9PORT = 2568
10
11[arm] 8[arm]
12DEFAULTSERVICES = peerinfo transport core 9DEFAULTSERVICES = peerinfo transport core
13 10
14[datastore]
15AUTOSTART = YES
16
17[fs]
18AUTOSTART = YES
19
20[mesh]
21AUTOSTART = YES
22
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index bfb493fd9..168af17f4 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -8,18 +8,3 @@ CONNECT_ATTEMPTS = 14
8NUM_PEERS = 4 8NUM_PEERS = 4
9TOPOLOGY = CLIQUE 9TOPOLOGY = CLIQUE
10 10
11[transport-tcp]
12ENABLE_UPNP = NO
13
14[transport-udp]
15PORT = 2568
16
17[datastore]
18AUTOSTART = YES
19
20[fs]
21AUTOSTART = YES
22
23[mesh]
24AUTOSTART = YES
25
diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index b0b7ed75a..c7abeae5e 100644
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -8,18 +8,6 @@ TOPOLOGY = CLIQUE
8CONNECT_TOPOLOGY_OPTION = CONNECT_DFS 8CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
10 10
11[transport-udp]
12PORT = 2568
13
14[arm] 11[arm]
15DEFAULTSERVICES = peerinfo transport core 12DEFAULTSERVICES = peerinfo transport core
16 13
17[datastore]
18AUTOSTART = YES
19
20[fs]
21AUTOSTART = YES
22
23[mesh]
24AUTOSTART = YES
25
diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 408930312..ef95cb1fd 100644
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -8,15 +8,3 @@ TOPOLOGY = CLIQUE
8CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM 8CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0 9CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
10 10
11[transport-udp]
12PORT = 2568
13
14[datastore]
15AUTOSTART = YES
16
17[fs]
18AUTOSTART = YES
19
20[mesh]
21AUTOSTART = YES
22
diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index 2ff37b45d..cd44b65f0 100644
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -8,21 +8,9 @@ TOPOLOGY = CLIQUE
8CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET 8CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
9CONNECT_TOPOLOGY_OPTION_MODIFIER = .15 9CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
10 10
11[transport-udp]
12PORT = 2568
13
14[statistics] 11[statistics]
15AUTOSTART = NO 12AUTOSTART = NO
16 13
17[resolver] 14[resolver]
18AUTOSTART = NO 15AUTOSTART = NO
19 16
20[datastore]
21AUTOSTART = YES
22
23[fs]
24AUTOSTART = YES
25
26[mesh]
27AUTOSTART = YES
28
diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index 98c08e066..8e1741352 100644
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
5[TESTING] 5[TESTING]
6TOPOLOGY = ERDOS_RENYI 6TOPOLOGY = ERDOS_RENYI
7 7
8[datastore]
9AUTOSTART = YES
10
11[fs]
12AUTOSTART = YES
13
14[mesh]
15AUTOSTART = YES
16
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index ee883cce7..af3f62f39 100644
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
5[TESTING] 5[TESTING]
6TOPOLOGY = INTERNAT 6TOPOLOGY = INTERNAT
7 7
8[datastore]
9AUTOSTART = YES
10
11[fs]
12AUTOSTART = YES
13
14[mesh]
15AUTOSTART = YES
16
diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 0a05572c0..dbee5d0b9 100644
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -9,9 +9,6 @@ F2F = NO
9BLACKLIST_TOPOLOGY = NONE 9BLACKLIST_TOPOLOGY = NONE
10CONNECT_TOPOLOGY = RING 10CONNECT_TOPOLOGY = RING
11 11
12[transport-tcp]
13BINDTO = 127.0.0.1
14
15[arm] 12[arm]
16PORT = 0 13PORT = 0
17 14
@@ -38,13 +35,3 @@ PORT = 0
38[hostlist] 35[hostlist]
39PORT = 0 36PORT = 0
40 37
41[datastore]
42AUTOSTART = YES
43
44[fs]
45AUTOSTART = YES
46PORT = 0
47
48[mesh]
49AUTOSTART = YES
50
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 3bd0c956b..6159030f4 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
5[TESTING] 5[TESTING]
6TOPOLOGY = RING 6TOPOLOGY = RING
7 7
8[datastore]
9AUTOSTART = YES
10
11[fs]
12AUTOSTART = YES
13
14[mesh]
15AUTOSTART = YES
16
diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index 26b9e1369..7690eac29 100644
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -6,18 +6,6 @@ DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
6NUM_PEERS = 50 6NUM_PEERS = 50
7TOPOLOGY = SCALE_FREE 7TOPOLOGY = SCALE_FREE
8 8
9[transport-udp]
10PORT = 2568
11
12[arm] 9[arm]
13DEFAULTSERVICES = peerinfo transport core 10DEFAULTSERVICES = peerinfo transport core
14 11
15[datastore]
16AUTOSTART = YES
17
18[fs]
19AUTOSTART = YES
20
21[mesh]
22AUTOSTART = YES
23
diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 02048dcfd..01931df6d 100644
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -6,12 +6,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
6NUM_PEERS = 25 6NUM_PEERS = 25
7TOPOLOGY = SMALL_WORLD_RING 7TOPOLOGY = SMALL_WORLD_RING
8 8
9[datastore]
10AUTOSTART = YES
11
12[fs]
13AUTOSTART = YES
14
15[mesh]
16AUTOSTART = YES
17
diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index a8a82aa04..7c35454de 100644
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -5,12 +5,3 @@ DEFAULTCONFIG = test_testing_data_topology_clique.conf
5[TESTING] 5[TESTING]
6TOPOLOGY = SMALL_WORLD 6TOPOLOGY = SMALL_WORLD
7 7
8[datastore]
9AUTOSTART = YES
10
11[fs]
12AUTOSTART = YES
13
14[mesh]
15AUTOSTART = YES
16
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index 4667c716d..fc35fc8ab 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -7,15 +7,3 @@ SETTLE_TIME = 600
7NUM_PEERS = 2 7NUM_PEERS = 2
8TOPOLOGY = CLIQUE 8TOPOLOGY = CLIQUE
9 9
10[transport-udp]
11PORT = 2568
12
13[datastore]
14AUTOSTART = YES
15
16[fs]
17AUTOSTART = YES
18
19[mesh]
20AUTOSTART = YES
21
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 4b6a6276d..5195882b4 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -18,6 +18,7 @@ PORT = 2567
18 18
19[transport-tcp] 19[transport-tcp]
20PORT = 2568 20PORT = 2568
21BINDTO = 127.0.0.1
21 22
22[peerinfo] 23[peerinfo]
23PORT = 2569 24PORT = 2569
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 0973cd3d1..be734c7d2 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -20,6 +20,3 @@ USE_PROGRESSBARS = NO
20[arm] 20[arm]
21DEFAULTSERVICES = core 21DEFAULTSERVICES = core
22 22
23[mesh]
24AUTOSTART = YES
25
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 12:30:09 +0000