aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/integration-tests/Makefile.am10
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf344
-rw-r--r--src/integration-tests/confs/c_nat_client.conf0
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf344
-rwxr-xr-xsrc/integration-tests/test_integration_bootstrap_and_connect.py.in110
-rwxr-xr-xsrc/integration-tests/test_integration_clique.py.in31
6 files changed, 821 insertions, 18 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 9813318a5..43c35aeb8 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -16,7 +16,8 @@ check_PROGRAMS =
16 16
17if HAVE_PYTHON_PEXPECT 17if HAVE_PYTHON_PEXPECT
18check_SCRIPTS = \ 18check_SCRIPTS = \
19 test_integration_clique.py 19 test_integration_bootstrap_and_connect.py \
20 test_integration_clique.py
20endif 21endif
21 22
22 23
@@ -31,8 +32,13 @@ test_integration_clique.py: test_integration_clique.py.in Makefile
31 $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py 32 $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
32 chmod +x test_integration_clique.py 33 chmod +x test_integration_clique.py
33 34
35test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
36 $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
37 chmod +x test_integration_bootstrap_and_connect.py
34 38
35EXTRA_DIST = \ 39EXTRA_DIST = \
36 test_integration_clique.py.in 40 test_integration_bootstrap_and_connect.py.in
41# test_integration_clique.py.in
42
37 43
38CLEANFILES = $(check_SCRIPTS) 44CLEANFILES = $(check_SCRIPTS)
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
new file mode 100644
index 000000000..2d20e08a6
--- /dev/null
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -0,0 +1,344 @@
1[PATHS]
2SERVICEHOME = /tmp/c_bootstrap_server/
3DEFAULTCONFIG = confs/c_bootstrap_server.conf
4
5[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey
7HOSTKEY = hostkeys/0000-hostkey
8
9[resolver]
10AUTOSTART = YES
11PORT = 20017
12HOSTNAME = localhost
13HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-resolver
16ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1;
18UNIXPATH = /tmp/test-service-resolver-14
19UNIX_MATCH_UID = NO
20UNIX_MATCH_GID = NO
21
22[mesh]
23AUTOSTART = YES
24PORT = 20016
25HOSTNAME = localhost
26HOME = $SERVICEHOME
27CONFIG = $DEFAULTCONFIG
28BINARY = gnunet-service-mesh
29ACCEPT_FROM = 127.0.0.1;
30ACCEPT_FROM6 = ::1;
31UNIXPATH = /tmp/test-service-mesh-13
32UNIX_MATCH_UID = YES
33UNIX_MATCH_GID = YES
34
35[nse]
36AUTOSTART = YES
37PORT = 20015
38HOSTNAME = localhost
39HOME = $SERVICEHOME
40CONFIG = $DEFAULTCONFIG
41BINARY = gnunet-service-nse
42ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1;
44UNIXPATH = /tmp/test-service-nse-12
45UNIX_MATCH_UID = YES
46UNIX_MATCH_GID = YES
47PROOFFILE = $SERVICEHOME/.nse-proof
48HISTOGRAM = $SERVICEHOME/nse-history.log
49WORKDELAY = 5 ms
50INTERVAL = 1 h
51WORKBITS = 26
52
53[topology]
54MINIMUM-FRIENDS = 0
55FRIENDS-ONLY = NO
56AUTOCONNECT = YES
57TARGET-CONNECTION-COUNT = 16
58FRIENDS = $SERVICEHOME/friends
59CONFIG = $DEFAULTCONFIG
60BINARY = gnunet-daemon-topology
61
62[datastore]
63AUTOSTART = YES
64UNIXPATH = /tmp/test-service-datastore-11
65UNIX_MATCH_UID = YES
66UNIX_MATCH_GID = YES
67PORT = 20014
68HOSTNAME = localhost
69HOME = $SERVICEHOME
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1;
74QUOTA = 100 MB
75BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
76DATABASE = sqlite
77
78[datastore-sqlite]
79FILENAME = $SERVICEHOME/datastore/sqlite.db
80
81[datastore-postgres]
82CONFIG = connect_timeout=10; dbname=gnunet
83
84[datastore-mysql]
85DATABASE = gnunet
86CONFIG = ~/.my.cnf
87
88[peerinfo]
89AUTOSTART = YES
90PORT = 20013
91HOSTNAME = localhost
92HOME = $SERVICEHOME
93CONFIG = $DEFAULTCONFIG
94BINARY = gnunet-service-peerinfo
95ACCEPT_FROM = 127.0.0.1;
96ACCEPT_FROM6 = ::1;
97UNIXPATH = /tmp/test-service-peerinfo-10
98UNIX_MATCH_UID = NO
99UNIX_MATCH_GID = YES
100HOSTS = $SERVICEHOME/data/hosts/
101
102[client]
103HOME = $SERVICEHOME
104
105[TESTING]
106WEAKRANDOM = YES
107CONNECT_TIMEOUT = 30 s
108CONNECT_ATTEMPTS = 3
109MAX_OUTSTANDING_CONNECTIONS = 50
110DELETE_FILES = YES
111
112[ats]
113AUTOSTART = YES
114PORT = 20012
115HOSTNAME = localhost
116HOME = $SERVICEHOME
117CONFIG = $DEFAULTCONFIG
118BINARY = gnunet-service-ats
119ACCEPT_FROM = 127.0.0.1;
120ACCEPT_FROM6 = ::1;
121UNIXPATH = /tmp/test-service-ats-9
122UNIX_MATCH_UID = YES
123UNIX_MATCH_GID = YES
124WAN_QUOTA_IN = 65536
125WAN_QUOTA_OUT = 65536
126DUMP_MLP = NO
127DUMP_SOLUTION = NO
128DUMP_OVERWRITE = NO
129DUMP_MIN_PEERS = 0
130DUMP_MIN_ADDRS = 0
131ATS_MIN_INTERVAL = 15000
132ATS_EXEC_INTERVAL = 30000
133
134[transport]
135AUTOSTART = YES
136PORT = 20011
137HOSTNAME = localhost
138HOME = $SERVICEHOME
139CONFIG = $DEFAULTCONFIG
140BINARY = gnunet-service-transport
141NEIGHBOUR_LIMIT = 50
142ACCEPT_FROM = 127.0.0.1;
143ACCEPT_FROM6 = ::1;
144PLUGINS = tcp
145UNIXPATH = /tmp/test-service-transport-8
146BLACKLIST_FILE = $SERVICEHOME/blacklist
147UNIX_MATCH_UID = YES
148UNIX_MATCH_GID = YES
149
150[transport-tcp]
151USE_LOCALADDR = YES
152PORT = 20010
153ADVERTISED_PORT = 20010
154MAX_CONNECTIONS = 128
155TIMEOUT = 5 s
156
157[transport-udp]
158USE_LOCALADDR = YES
159PORT = 20009
160BROADCAST = YES
161BROADCAST_INTERVAL = 30000
162MAX_BPS = 1000000
163
164[transport-http]
165PORT = 20008
166MAX_CONNECTIONS = 128
167
168[transport-https]
169PORT = 20007
170CRYPTO_INIT = NORMAL
171KEY_FILE = https.key
172CERT_FILE = https.cert
173MAX_CONNECTIONS = 128
174
175[transport-wlan]
176INTERFACE = mon0
177TESTMODE = 0
178
179[datacache-mysql]
180DATABASE = gnunet
181CONFIG = ~/.my.cnf
182
183[datacache-postgres]
184CONFIG = connect_timeout=10; dbname=gnunet
185
186[template]
187AUTOSTART = NO
188PORT = 20006
189HOSTNAME = localhost
190HOME = $SERVICEHOME
191CONFIG = $DEFAULTCONFIG
192BINARY = gnunet-service-template
193ACCEPT_FROM = 127.0.0.1;
194ACCEPT_FROM6 = ::1;
195UNIXPATH = /tmp/test-service-template-7
196UNIX_MATCH_UID = YES
197UNIX_MATCH_GID = YES
198
199[fs]
200AUTOSTART = YES
201INDEXDB = $SERVICEHOME/idxinfo.lst
202TRUST = $SERVICEHOME/data/credit/
203IDENTITY_DIR = $SERVICEHOME/identities/
204STATE_DIR = $SERVICEHOME/persistence/
205UPDATE_DIR = $SERVICEHOME/updates/
206PORT = 20005
207HOSTNAME = localhost
208HOME = $SERVICEHOME
209CONFIG = $DEFAULTCONFIG
210BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1;
213DELAY = YES
214CONTENT_CACHING = YES
215CONTENT_PUSHING = YES
216UNIXPATH = /tmp/test-service-fs-6
217UNIX_MATCH_UID = NO
218UNIX_MATCH_GID = YES
219MAX_PENDING_REQUESTS = 65536
220MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128
222
223[vpn]
224CONFIG = $DEFAULTCONFIG
225BINARY = gnunet-daemon-vpn
226IPV6ADDR = 1234::1
227IPV6PREFIX = 32
228IPV4ADDR = 10.11.10.1
229IPV4MASK = 255.255.0.0
230VIRTDNS = 10.11.10.2
231VIRTDNS6 = 1234::17
232IFNAME = vpn-gnunet
233
234[exit]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-exit
237IPV6ADDR = 1234:1::1
238IPV6PREFIX = 32
239IPV4ADDR = 10.10.1.1
240IPV4MASK = 255.255.0.0
241IFNAME = exit-gnunet
242ENABLE_UDP = NO
243ENABLE_TCP = NO
244
245[dns]
246AUTOSTART = YES
247PORT = 0
248HOSTNAME = localhost
249HOME = $SERVICEHOME
250CONFIG = $DEFAULTCONFIG
251BINARY = gnunet-service-dns
252ACCEPT_FROM = 127.0.0.1;
253ACCEPT_FROM6 = ::1;
254UNIXPATH = /tmp/test-service-dns-5
255PROVIDE_EXIT = NO
256
257[arm]
258PORT = 20004
259HOSTNAME = localhost
260HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-arm
263ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1;
265DEFAULTSERVICES = topology hostlist
266UNIXPATH = /tmp/test-service-arm-4
267UNIX_MATCH_UID = YES
268UNIX_MATCH_GID = YES
269
270[hostlist]
271HTTPPORT = 8080
272HOME = $SERVICEHOME
273HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274CONFIG = $DEFAULTCONFIG
275BINARY = gnunet-daemon-hostlist
276OPTIONS = -p
277#SERVERS = http://v9.gnunet.org:58080/
278HTTP-PROXY =
279
280[core]
281AUTOSTART = YES
282PORT = 20003
283HOSTNAME = localhost
284HOME = $SERVICEHOME
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-service-core
287ACCEPT_FROM = 127.0.0.1;
288ACCEPT_FROM6 = ::1;
289UNIXPATH = /tmp/test-service-core-3
290UNIX_MATCH_UID = YES
291UNIX_MATCH_GID = YES
292
293[nat]
294EXTERNAL_ADDRESS = 127.0.0.1
295INTERNAL_ADDRESS = 127.0.0.1
296BINDTO = 127.0.0.1
297BEHIND_NAT = NO
298PUNCHED_NAT = NO
299ENABLE_UPNP = NO
300USE_LOCALADDR = YES
301USE_HOSTNAME = NO
302ENABLE_ICMP_CLIENT = NO
303ENABLE_ICMP_SERVER = NO
304DISABLEV6 = YES
305RETURN_LOCAL_ADDRESSES = NO
306HOSTNAME_DNS_FREQUENCY = 1200000
307IFC_SCAN_FREQUENCY = 3000000
308DYNDNS_FREQUENCY = 140000
309
310[gnunet-nat-server]
311HOSTNAME = gnunet.org
312PORT = 20002
313
314[statistics]
315AUTOSTART = YES
316PORT = 20001
317HOSTNAME = localhost
318HOME = $SERVICEHOME
319CONFIG = $DEFAULTCONFIG
320BINARY = gnunet-service-statistics
321ACCEPT_FROM = 127.0.0.1;
322ACCEPT_FROM6 = ::1;
323UNIXPATH = /tmp/test-service-statistics-2
324UNIX_MATCH_UID = NO
325UNIX_MATCH_GID = YES
326
327[dht]
328AUTOSTART = YES
329PORT = 20000
330HOSTNAME = localhost
331HOME = $SERVICEHOME
332CONFIG = $DEFAULTCONFIG
333BINARY = gnunet-service-dht
334ACCEPT_FROM = 127.0.0.1;
335ACCEPT_FROM6 = ::1;
336BUCKET_SIZE = 4
337UNIXPATH = /tmp/test-service-dht-1
338UNIX_MATCH_UID = YES
339UNIX_MATCH_GID = YES
340
341[dhtcache]
342DATABASE = sqlite
343QUOTA = 1 MB
344
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/integration-tests/confs/c_nat_client.conf
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
new file mode 100644
index 000000000..908212c18
--- /dev/null
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -0,0 +1,344 @@
1[PATHS]
2SERVICEHOME = /tmp/c_no_nat_client/
3DEFAULTCONFIG = confs/c_no_nat_client.conf
4
5[gnunetd]
6#HOSTKEY = $SERVICEHOME/.hostkey
7HOSTKEY = hostkeys/0001-hostkey
8
9[resolver]
10AUTOSTART = YES
11PORT = 20035
12HOSTNAME = localhost
13HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-resolver
16ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1;
18UNIXPATH = /tmp/test-service-resolver-28
19UNIX_MATCH_UID = NO
20UNIX_MATCH_GID = NO
21
22[mesh]
23AUTOSTART = YES
24PORT = 20034
25HOSTNAME = localhost
26HOME = $SERVICEHOME
27CONFIG = $DEFAULTCONFIG
28BINARY = gnunet-service-mesh
29ACCEPT_FROM = 127.0.0.1;
30ACCEPT_FROM6 = ::1;
31UNIXPATH = /tmp/test-service-mesh-27
32UNIX_MATCH_UID = YES
33UNIX_MATCH_GID = YES
34
35[nse]
36AUTOSTART = YES
37PORT = 20033
38HOSTNAME = localhost
39HOME = $SERVICEHOME
40CONFIG = $DEFAULTCONFIG
41BINARY = gnunet-service-nse
42ACCEPT_FROM = 127.0.0.1;
43ACCEPT_FROM6 = ::1;
44UNIXPATH = /tmp/test-service-nse-26
45UNIX_MATCH_UID = YES
46UNIX_MATCH_GID = YES
47PROOFFILE = $SERVICEHOME/.nse-proof
48HISTOGRAM = $SERVICEHOME/nse-history.log
49WORKDELAY = 5 ms
50INTERVAL = 1 h
51WORKBITS = 26
52
53[topology]
54MINIMUM-FRIENDS = 0
55FRIENDS-ONLY = NO
56AUTOCONNECT = YES
57TARGET-CONNECTION-COUNT = 16
58FRIENDS = $SERVICEHOME/friends
59CONFIG = $DEFAULTCONFIG
60BINARY = gnunet-daemon-topology
61
62[datastore]
63AUTOSTART = YES
64UNIXPATH = /tmp/test-service-datastore-25
65UNIX_MATCH_UID = YES
66UNIX_MATCH_GID = YES
67PORT = 20032
68HOSTNAME = localhost
69HOME = $SERVICEHOME
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-service-datastore
72ACCEPT_FROM = 127.0.0.1;
73ACCEPT_FROM6 = ::1;
74QUOTA = 100 MB
75BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
76DATABASE = sqlite
77
78[datastore-sqlite]
79FILENAME = $SERVICEHOME/datastore/sqlite.db
80
81[datastore-postgres]
82CONFIG = connect_timeout=10; dbname=gnunet
83
84[datastore-mysql]
85DATABASE = gnunet
86CONFIG = ~/.my.cnf
87
88[peerinfo]
89AUTOSTART = YES
90PORT = 20031
91HOSTNAME = localhost
92HOME = $SERVICEHOME
93CONFIG = $DEFAULTCONFIG
94BINARY = gnunet-service-peerinfo
95ACCEPT_FROM = 127.0.0.1;
96ACCEPT_FROM6 = ::1;
97UNIXPATH = /tmp/test-service-peerinfo-24
98UNIX_MATCH_UID = NO
99UNIX_MATCH_GID = YES
100HOSTS = $SERVICEHOME/data/hosts/
101
102[client]
103HOME = $SERVICEHOME
104
105[TESTING]
106WEAKRANDOM = NO
107CONNECT_TIMEOUT = 30 s
108CONNECT_ATTEMPTS = 3
109MAX_OUTSTANDING_CONNECTIONS = 50
110DELETE_FILES = YES
111
112[ats]
113AUTOSTART = YES
114PORT = 20030
115HOSTNAME = localhost
116HOME = $SERVICEHOME
117CONFIG = $DEFAULTCONFIG
118BINARY = gnunet-service-ats
119ACCEPT_FROM = 127.0.0.1;
120ACCEPT_FROM6 = ::1;
121UNIXPATH = /tmp/test-service-ats-23
122UNIX_MATCH_UID = YES
123UNIX_MATCH_GID = YES
124WAN_QUOTA_IN = 65536
125WAN_QUOTA_OUT = 65536
126DUMP_MLP = NO
127DUMP_SOLUTION = NO
128DUMP_OVERWRITE = NO
129DUMP_MIN_PEERS = 0
130DUMP_MIN_ADDRS = 0
131ATS_MIN_INTERVAL = 15000
132ATS_EXEC_INTERVAL = 30000
133
134[transport]
135AUTOSTART = YES
136PORT = 20029
137HOSTNAME = localhost
138HOME = $SERVICEHOME
139CONFIG = $DEFAULTCONFIG
140BINARY = gnunet-service-transport
141NEIGHBOUR_LIMIT = 50
142ACCEPT_FROM = 127.0.0.1;
143ACCEPT_FROM6 = ::1;
144PLUGINS = tcp
145UNIXPATH = /tmp/test-service-transport-22
146BLACKLIST_FILE = $SERVICEHOME/blacklist
147UNIX_MATCH_UID = YES
148UNIX_MATCH_GID = YES
149
150[transport-tcp]
151USE_LOCALADDR = YES
152PORT = 20028
153ADVERTISED_PORT = 20028
154MAX_CONNECTIONS = 128
155TIMEOUT = 5 s
156
157[transport-udp]
158USE_LOCALADDR = YES
159PORT = 20027
160BROADCAST = YES
161BROADCAST_INTERVAL = 30000
162MAX_BPS = 1000000
163
164[transport-http]
165PORT = 20026
166MAX_CONNECTIONS = 128
167
168[transport-https]
169PORT = 20025
170CRYPTO_INIT = NORMAL
171KEY_FILE = https.key
172CERT_FILE = https.cert
173MAX_CONNECTIONS = 128
174
175[transport-wlan]
176INTERFACE = mon0
177TESTMODE = 0
178
179[datacache-mysql]
180DATABASE = gnunet
181CONFIG = ~/.my.cnf
182
183[datacache-postgres]
184CONFIG = connect_timeout=10; dbname=gnunet
185
186[template]
187AUTOSTART = NO
188PORT = 20024
189HOSTNAME = localhost
190HOME = $SERVICEHOME
191CONFIG = $DEFAULTCONFIG
192BINARY = gnunet-service-template
193ACCEPT_FROM = 127.0.0.1;
194ACCEPT_FROM6 = ::1;
195UNIXPATH = /tmp/test-service-template-21
196UNIX_MATCH_UID = YES
197UNIX_MATCH_GID = YES
198
199[fs]
200AUTOSTART = YES
201INDEXDB = $SERVICEHOME/idxinfo.lst
202TRUST = $SERVICEHOME/data/credit/
203IDENTITY_DIR = $SERVICEHOME/identities/
204STATE_DIR = $SERVICEHOME/persistence/
205UPDATE_DIR = $SERVICEHOME/updates/
206PORT = 20023
207HOSTNAME = localhost
208HOME = $SERVICEHOME
209CONFIG = $DEFAULTCONFIG
210BINARY = gnunet-service-fs
211ACCEPT_FROM = 127.0.0.1;
212ACCEPT_FROM6 = ::1;
213DELAY = YES
214CONTENT_CACHING = YES
215CONTENT_PUSHING = YES
216UNIXPATH = /tmp/test-service-fs-20
217UNIX_MATCH_UID = NO
218UNIX_MATCH_GID = YES
219MAX_PENDING_REQUESTS = 65536
220MIN_MIGRATION_DELAY = 100 ms
221EXPECTED_NEIGHBOUR_COUNT = 128
222
223[vpn]
224CONFIG = $DEFAULTCONFIG
225BINARY = gnunet-daemon-vpn
226IPV6ADDR = 1234::1
227IPV6PREFIX = 32
228IPV4ADDR = 10.11.10.1
229IPV4MASK = 255.255.0.0
230VIRTDNS = 10.11.10.2
231VIRTDNS6 = 1234::17
232IFNAME = vpn-gnunet
233
234[exit]
235CONFIG = $DEFAULTCONFIG
236BINARY = gnunet-daemon-exit
237IPV6ADDR = 1234:1::1
238IPV6PREFIX = 32
239IPV4ADDR = 10.10.1.1
240IPV4MASK = 255.255.0.0
241IFNAME = exit-gnunet
242ENABLE_UDP = NO
243ENABLE_TCP = NO
244
245[dns]
246AUTOSTART = YES
247PORT = 0
248HOSTNAME = localhost
249HOME = $SERVICEHOME
250CONFIG = $DEFAULTCONFIG
251BINARY = gnunet-service-dns
252ACCEPT_FROM = 127.0.0.1;
253ACCEPT_FROM6 = ::1;
254UNIXPATH = /tmp/test-service-dns-19
255PROVIDE_EXIT = NO
256
257[arm]
258PORT = 20022
259HOSTNAME = localhost
260HOME = $SERVICEHOME
261CONFIG = $DEFAULTCONFIG
262BINARY = gnunet-service-arm
263ACCEPT_FROM = 127.0.0.1;
264ACCEPT_FROM6 = ::1;
265DEFAULTSERVICES = topology hostlist
266UNIXPATH = /tmp/test-service-arm-18
267UNIX_MATCH_UID = YES
268UNIX_MATCH_GID = YES
269
270[hostlist]
271HTTPPORT = 8080
272HOME = $SERVICEHOME
273HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
274CONFIG = $DEFAULTCONFIG
275BINARY = gnunet-daemon-hostlist
276OPTIONS = -b
277SERVERS = http://v9.gnunet.org:58080/
278HTTP-PROXY =
279
280[core]
281AUTOSTART = YES
282PORT = 20021
283HOSTNAME = localhost
284HOME = $SERVICEHOME
285CONFIG = $DEFAULTCONFIG
286BINARY = gnunet-service-core
287ACCEPT_FROM = 127.0.0.1;
288ACCEPT_FROM6 = ::1;
289UNIXPATH = /tmp/test-service-core-17
290UNIX_MATCH_UID = YES
291UNIX_MATCH_GID = YES
292
293[nat]
294EXTERNAL_ADDRESS = 127.0.0.1
295INTERNAL_ADDRESS = 127.0.0.1
296BINDTO = 127.0.0.1
297BEHIND_NAT = NO
298PUNCHED_NAT = NO
299ENABLE_UPNP = NO
300USE_LOCALADDR = YES
301USE_HOSTNAME = NO
302ENABLE_ICMP_CLIENT = NO
303ENABLE_ICMP_SERVER = NO
304DISABLEV6 = YES
305RETURN_LOCAL_ADDRESSES = NO
306HOSTNAME_DNS_FREQUENCY = 1200000
307IFC_SCAN_FREQUENCY = 3000000
308DYNDNS_FREQUENCY = 140000
309
310[gnunet-nat-server]
311HOSTNAME = gnunet.org
312PORT = 20020
313
314[statistics]
315AUTOSTART = YES
316PORT = 20019
317HOSTNAME = localhost
318HOME = $SERVICEHOME
319CONFIG = $DEFAULTCONFIG
320BINARY = gnunet-service-statistics
321ACCEPT_FROM = 127.0.0.1;
322ACCEPT_FROM6 = ::1;
323UNIXPATH = /tmp/test-service-statistics-16
324UNIX_MATCH_UID = NO
325UNIX_MATCH_GID = YES
326
327[dht]
328AUTOSTART = YES
329PORT = 20018
330HOSTNAME = localhost
331HOME = $SERVICEHOME
332CONFIG = $DEFAULTCONFIG
333BINARY = gnunet-service-dht
334ACCEPT_FROM = 127.0.0.1;
335ACCEPT_FROM6 = ::1;
336BUCKET_SIZE = 4
337UNIXPATH = /tmp/test-service-dht-15
338UNIX_MATCH_UID = YES
339UNIX_MATCH_GID = YES
340
341[dhtcache]
342DATABASE = sqlite
343QUOTA = 1 MB
344
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
new file mode 100755
index 000000000..44e8df3df
--- /dev/null
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -0,0 +1,110 @@
1#!@PYTHON@
2# This file is part of GNUnet.
3# (C) 2010 Christian Grothoff (and other contributing authors)
4#
5# GNUnet is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published
7# by the Free Software Foundation; either version 2, or (at your
8# option) any later version.
9#
10# GNUnet is distributed in the hope that it will be useful, but
11# WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13# General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License
16# along with GNUnet; see the file COPYING. If not, write to the
17# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18# Boston, MA 02111-1307, USA.
19#
20#
21import sys
22import os
23import subprocess
24import re
25import shutil
26
27#
28# This test tests if a fresh peer bootstraps from a hostlist server and then
29# successfully connects to the server
30#
31
32#definitions
33
34def vpfrint (msg):
35 if verbose == True:
36 print msg
37
38
39testname = "test_integration_bootstrap_and_connect"
40verbose = True
41
42# setup
43
44srcdir = "../.."
45gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
46if gnunet_pyexpect_dir not in sys.path:
47 sys.path.append (gnunet_pyexpect_dir)
48
49from gnunet_pyexpect import pexpect
50
51if os.name == 'posix':
52 gnunetarm = 'gnunet-arm'
53elif os.name == 'nt':
54 gnunetarm = 'gnunet-arm.exe'
55
56if os.name == "nt":
57 shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
58else:
59 shutil.rmtree ("/tmp/" + testname, True)
60
61vpfrint ("Running " + testname)
62
63
64
65# start nodes
66
67vpfrint ("Starting bootstrap server & client")
68try:
69 server = subprocess.Popen ([gnunetarm, '-sq', '-c', './confs/c_bootstrap_server.conf'])
70 server.communicate ()
71except OSError:
72 print "Can not start bootstrap server, exiting..."
73 exit (1)
74try:
75 client = subprocess.Popen ([gnunetarm, '-sq', '-c', 'confs/c_no_nat_client.conf'])
76 client.communicate ()
77except OSError:
78 print "Can not start bootstrap client, exiting..."
79 exit (1)
80vpfrint ("Bootstrap server & client started")
81
82
83import time
84time.sleep(5)
85
86# shutdown
87vpfrint ("Shutting down bootstrap server")
88try:
89 server = subprocess.Popen ([gnunetarm, '-eq', '-c', './confs/c_bootstrap_server.conf'])
90 server.communicate ()
91except OSError:
92 print "Can not stop bootstrap server, exiting..."
93 exit (1)
94try:
95 client = subprocess.Popen ([gnunetarm, '-eq', '-c', 'confs/c_no_nat_client.conf'])
96 client.communicate ()
97except OSError:
98 print "Can not stop bootstrap client, exiting..."
99 exit (1)
100vpfrint ("Bootstrap server & client stopped")
101
102# clean up
103
104if os.name == "nt":
105 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
106else:
107 shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True)
108
109exit (0)
110
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 1f1cf1f1d..892f80931 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -17,13 +17,17 @@
17# Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18# Boston, MA 02111-1307, USA. 18# Boston, MA 02111-1307, USA.
19# 19#
20# Testcase for file-sharing command-line tools (namespaces) 20#
21import sys 21import sys
22import os 22import os
23import subprocess 23import subprocess
24import re 24import re
25import shutil 25import shutil
26 26
27
28testname = "test_integration_clique"
29verbose = True
30
27srcdir = "../.." 31srcdir = "../.."
28gnunet_pyexpect_dir = os.path.join (srcdir, "contrib") 32gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
29if gnunet_pyexpect_dir not in sys.path: 33if gnunet_pyexpect_dir not in sys.path:
@@ -31,29 +35,24 @@ if gnunet_pyexpect_dir not in sys.path:
31 35
32from gnunet_pyexpect import pexpect 36from gnunet_pyexpect import pexpect
33 37
34exit ()
35
36
37# dummy copied from fs
38
39if os.name == 'posix': 38if os.name == 'posix':
40 pseudonym = 'gnunet-pseudonym'
41 gnunetarm = 'gnunet-arm' 39 gnunetarm = 'gnunet-arm'
42 publish = 'gnunet-publish'
43 unindex = 'gnunet-unindex'
44 search = 'gnunet-search'
45elif os.name == 'nt': 40elif os.name == 'nt':
46 pseudonym = 'gnunet-pseudonym.exe'
47 gnunetarm = 'gnunet-arm.exe' 41 gnunetarm = 'gnunet-arm.exe'
48 publish = 'gnunet-publish.exe'
49 unindex = 'gnunet-unindex.exe'
50 search = 'gnunet-search.exe'
51 42
52if os.name == "nt": 43if os.name == "nt":
53 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) 44 shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
54else: 45else:
55 shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True) 46 shutil.rmtree ("/tmp/" + testname, True)
56 47
48if verbose == True:
49 print "Running " + testname
50
51
52
53
54exit ()
55# dummy copied from fs
57arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_ns_data.conf']) 56arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_ns_data.conf'])
58arm.communicate () 57arm.communicate ()
59 58