aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/integration-tests/confs/c_bootstrap_server_w_massif.conf364
-rw-r--r--src/integration-tests/gnunet_testing.py.in10
-rwxr-xr-xsrc/integration-tests/test_mem_consumption.py2
3 files changed, 371 insertions, 5 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
new file mode 100644
index 000000000..4e42e5faf
--- /dev/null
+++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
@@ -0,0 +1,364 @@
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[vpn]
10AUTOSTART = YES
11PORT = 0
12HOSTNAME = localhost
13HOME = $SERVICEHOME
14CONFIG = $DEFAULTCONFIG
15BINARY = gnunet-service-dns
16ACCEPT_FROM = 127.0.0.1;
17ACCEPT_FROM6 = ::1;
18UNIXPATH = /tmp/gnunet-service-vpn-15
19
20[resolver]
21AUTOSTART = YES
22PORT = 20017
23HOSTNAME = localhost
24HOME = $SERVICEHOME
25CONFIG = $DEFAULTCONFIG
26BINARY = gnunet-service-resolver
27ACCEPT_FROM = 127.0.0.1;
28ACCEPT_FROM6 = ::1;
29UNIXPATH = /tmp/test-service-resolver-14
30UNIX_MATCH_UID = NO
31UNIX_MATCH_GID = NO
32
33[mesh]
34AUTOSTART = YES
35PORT = 20016
36HOSTNAME = localhost
37HOME = $SERVICEHOME
38CONFIG = $DEFAULTCONFIG
39BINARY = gnunet-service-mesh
40ACCEPT_FROM = 127.0.0.1;
41ACCEPT_FROM6 = ::1;
42UNIXPATH = /tmp/test-service-mesh-13
43UNIX_MATCH_UID = YES
44UNIX_MATCH_GID = YES
45
46[nse]
47AUTOSTART = YES
48PORT = 20015
49HOSTNAME = localhost
50HOME = $SERVICEHOME
51CONFIG = $DEFAULTCONFIG
52BINARY = gnunet-service-nse
53ACCEPT_FROM = 127.0.0.1;
54ACCEPT_FROM6 = ::1;
55UNIXPATH = /tmp/test-service-nse-12
56UNIX_MATCH_UID = YES
57UNIX_MATCH_GID = YES
58PROOFFILE = $SERVICEHOME/.nse-proof
59HISTOGRAM = $SERVICEHOME/nse-history.log
60WORKDELAY = 5 ms
61INTERVAL = 1 h
62WORKBITS = 26
63
64[topology]
65MINIMUM-FRIENDS = 0
66FRIENDS-ONLY = NO
67AUTOCONNECT = YES
68TARGET-CONNECTION-COUNT = 16
69FRIENDS = $SERVICEHOME/friends
70CONFIG = $DEFAULTCONFIG
71BINARY = gnunet-daemon-topology
72
73[datastore]
74AUTOSTART = YES
75UNIXPATH = /tmp/test-service-datastore-11
76UNIX_MATCH_UID = YES
77UNIX_MATCH_GID = YES
78PORT = 20014
79HOSTNAME = localhost
80HOME = $SERVICEHOME
81CONFIG = $DEFAULTCONFIG
82BINARY = gnunet-service-datastore
83ACCEPT_FROM = 127.0.0.1;
84ACCEPT_FROM6 = ::1;
85QUOTA = 100 MB
86BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
87DATABASE = sqlite
88
89[datastore-sqlite]
90FILENAME = $SERVICEHOME/datastore/sqlite.db
91
92[datastore-postgres]
93CONFIG = connect_timeout=10; dbname=gnunet
94
95[datastore-mysql]
96DATABASE = gnunet
97CONFIG = ~/.my.cnf
98
99[peerinfo]
100AUTOSTART = YES
101PORT = 20013
102HOSTNAME = localhost
103HOME = $SERVICEHOME
104CONFIG = $DEFAULTCONFIG
105BINARY = gnunet-service-peerinfo
106ACCEPT_FROM = 127.0.0.1;
107ACCEPT_FROM6 = ::1;
108UNIXPATH = /tmp/test-service-peerinfo-10
109UNIX_MATCH_UID = NO
110UNIX_MATCH_GID = YES
111HOSTS = $SERVICEHOME/data/hosts/
112
113[client]
114HOME = $SERVICEHOME
115
116[TESTING]
117WEAKRANDOM = YES
118CONNECT_TIMEOUT = 30 s
119CONNECT_ATTEMPTS = 3
120MAX_OUTSTANDING_CONNECTIONS = 50
121DELETE_FILES = YES
122
123[ats]
124AUTOSTART = YES
125PORT = 20012
126HOSTNAME = localhost
127HOME = $SERVICEHOME
128CONFIG = $DEFAULTCONFIG
129BINARY = gnunet-service-ats
130ACCEPT_FROM = 127.0.0.1;
131ACCEPT_FROM6 = ::1;
132UNIXPATH = /tmp/test-service-ats-9
133UNIX_MATCH_UID = YES
134UNIX_MATCH_GID = YES
135WAN_QUOTA_IN = unlimited
136WAN_QUOTA_OUT = unlimited
137DUMP_MLP = NO
138DUMP_SOLUTION = NO
139DUMP_OVERWRITE = NO
140DUMP_MIN_PEERS = 0
141DUMP_MIN_ADDRS = 0
142ATS_MIN_INTERVAL = 15000
143ATS_EXEC_INTERVAL = 30000
144
145[transport]
146PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif
147AUTOSTART = YES
148PORT = 20011
149HOSTNAME = localhost
150HOME = $SERVICEHOME
151CONFIG = $DEFAULTCONFIG
152BINARY = gnunet-service-transport
153NEIGHBOUR_LIMIT = 50
154ACCEPT_FROM = 127.0.0.1;
155ACCEPT_FROM6 = ::1;
156PLUGINS = tcp
157UNIXPATH = /tmp/test-service-transport-8
158BLACKLIST_FILE = $SERVICEHOME/blacklist
159UNIX_MATCH_UID = YES
160UNIX_MATCH_GID = YES
161
162[transport-tcp]
163USE_LOCALADDR = YES
164PORT = 20010
165ADVERTISED_PORT = 20010
166MAX_CONNECTIONS = 128
167TIMEOUT = 5 s
168
169[transport-udp]
170USE_LOCALADDR = YES
171PORT = 20009
172BROADCAST = YES
173BROADCAST_INTERVAL = 30000
174MAX_BPS = 1000000
175
176[transport-http]
177PORT = 20008
178MAX_CONNECTIONS = 128
179
180[transport-https]
181PORT = 20007
182CRYPTO_INIT = NORMAL
183KEY_FILE = https.key
184CERT_FILE = https.cert
185MAX_CONNECTIONS = 128
186
187[transport-wlan]
188INTERFACE = mon0
189TESTMODE = 0
190
191[datacache-mysql]
192DATABASE = gnunet
193CONFIG = ~/.my.cnf
194
195[datacache-postgres]
196CONFIG = connect_timeout=10; dbname=gnunet
197
198[template]
199AUTOSTART = NO
200PORT = 20006
201HOSTNAME = localhost
202HOME = $SERVICEHOME
203CONFIG = $DEFAULTCONFIG
204BINARY = gnunet-service-template
205ACCEPT_FROM = 127.0.0.1;
206ACCEPT_FROM6 = ::1;
207UNIXPATH = /tmp/test-service-template-7
208UNIX_MATCH_UID = YES
209UNIX_MATCH_GID = YES
210
211[fs]
212AUTOSTART = YES
213INDEXDB = $SERVICEHOME/idxinfo.lst
214TRUST = $SERVICEHOME/data/credit/
215IDENTITY_DIR = $SERVICEHOME/identities/
216STATE_DIR = $SERVICEHOME/persistence/
217UPDATE_DIR = $SERVICEHOME/updates/
218PORT = 20005
219HOSTNAME = localhost
220HOME = $SERVICEHOME
221CONFIG = $DEFAULTCONFIG
222BINARY = gnunet-service-fs
223ACCEPT_FROM = 127.0.0.1;
224ACCEPT_FROM6 = ::1;
225DELAY = YES
226CONTENT_CACHING = YES
227CONTENT_PUSHING = YES
228UNIXPATH = /tmp/test-service-fs-6
229UNIX_MATCH_UID = NO
230UNIX_MATCH_GID = YES
231MAX_PENDING_REQUESTS = 65536
232MIN_MIGRATION_DELAY = 100 ms
233EXPECTED_NEIGHBOUR_COUNT = 128
234
235[vpn]
236CONFIG = $DEFAULTCONFIG
237BINARY = gnunet-daemon-vpn
238IPV6ADDR = 1234::1
239IPV6PREFIX = 32
240IPV4ADDR = 10.11.10.1
241IPV4MASK = 255.255.0.0
242VIRTDNS = 10.11.10.2
243VIRTDNS6 = 1234::17
244IFNAME = vpn-gnunet
245
246[exit]
247CONFIG = $DEFAULTCONFIG
248BINARY = gnunet-daemon-exit
249IPV6ADDR = 1234:1::1
250IPV6PREFIX = 32
251IPV4ADDR = 10.10.1.1
252IPV4MASK = 255.255.0.0
253IFNAME = exit-gnunet
254ENABLE_UDP = NO
255ENABLE_TCP = NO
256
257[dns]
258AUTOSTART = YES
259PORT = 0
260HOSTNAME = localhost
261HOME = $SERVICEHOME
262CONFIG = $DEFAULTCONFIG
263BINARY = gnunet-service-dns
264ACCEPT_FROM = 127.0.0.1;
265ACCEPT_FROM6 = ::1;
266UNIXPATH = /tmp/test-service-dns-5
267PROVIDE_EXIT = NO
268
269[arm]
270PORT = 20004
271HOSTNAME = localhost
272HOME = $SERVICEHOME
273CONFIG = $DEFAULTCONFIG
274BINARY = gnunet-service-arm
275ACCEPT_FROM = 127.0.0.1;
276ACCEPT_FROM6 = ::1;
277DEFAULTSERVICES = topology hostlist fs
278UNIXPATH = /tmp/test-service-arm-4
279UNIX_MATCH_UID = YES
280UNIX_MATCH_GID = YES
281
282[hostlist]
283HTTPPORT = 8080
284HOME = $SERVICEHOME
285HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
286CONFIG = $DEFAULTCONFIG
287BINARY = gnunet-daemon-hostlist
288OPTIONS = -p
289#SERVERS = http://v9.gnunet.org:58080/
290HTTP-PROXY =
291
292[core]
293AUTOSTART = YES
294PORT = 20003
295HOSTNAME = localhost
296HOME = $SERVICEHOME
297CONFIG = $DEFAULTCONFIG
298BINARY = gnunet-service-core
299ACCEPT_FROM = 127.0.0.1;
300ACCEPT_FROM6 = ::1;
301UNIXPATH = /tmp/test-service-core-3
302UNIX_MATCH_UID = YES
303UNIX_MATCH_GID = YES
304
305[nat]
306EXTERNAL_ADDRESS = 127.0.0.1
307INTERNAL_ADDRESS = 127.0.0.1
308BINDTO = 127.0.0.1
309BEHIND_NAT = NO
310PUNCHED_NAT = NO
311ENABLE_UPNP = NO
312USE_LOCALADDR = YES
313USE_HOSTNAME = NO
314ENABLE_ICMP_CLIENT = NO
315ENABLE_ICMP_SERVER = NO
316DISABLEV6 = YES
317RETURN_LOCAL_ADDRESSES = NO
318HOSTNAME_DNS_FREQUENCY = 1200000
319IFC_SCAN_FREQUENCY = 3000000
320DYNDNS_FREQUENCY = 140000
321
322[gnunet-nat-server]
323HOSTNAME = gnunet.org
324PORT = 20002
325
326[statistics]
327AUTOSTART = YES
328PORT = 20001
329HOSTNAME = localhost
330HOME = $SERVICEHOME
331CONFIG = $DEFAULTCONFIG
332BINARY = gnunet-service-statistics
333ACCEPT_FROM = 127.0.0.1;
334ACCEPT_FROM6 = ::1;
335UNIXPATH = /tmp/test-service-statistics-2
336UNIX_MATCH_UID = NO
337UNIX_MATCH_GID = YES
338
339[dht]
340AUTOSTART = YES
341PORT = 20000
342HOSTNAME = localhost
343HOME = $SERVICEHOME
344CONFIG = $DEFAULTCONFIG
345BINARY = gnunet-service-dht
346ACCEPT_FROM = 127.0.0.1;
347ACCEPT_FROM6 = ::1;
348BUCKET_SIZE = 4
349UNIXPATH = /tmp/test-service-dht-1
350UNIX_MATCH_UID = YES
351UNIX_MATCH_GID = YES
352
353[dhtcache]
354DATABASE = sqlite
355QUOTA = 1 MB
356
357[gns]
358AUTOSTART = NO
359
360[namestore]
361AUTOSTART = NO
362
363[lockmanager]
364AUTOSTART = NO \ No newline at end of file
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in
index 41e709f8c..0e3cdaaf8 100644
--- a/src/integration-tests/gnunet_testing.py.in
+++ b/src/integration-tests/gnunet_testing.py.in
@@ -53,11 +53,13 @@ class Check:
53 if ((False == res) and (execs >= timeout)): 53 if ((False == res) and (execs >= timeout)):
54 print ('Check had timeout after ' +str(timeout)+ ' seconds') 54 print ('Check had timeout after ' +str(timeout)+ ' seconds')
55 neg_cont (self) 55 neg_cont (self)
56 elif ((False == res) and (execs >= timeout)): 56 elif ((False == res) and (execs < timeout)):
57 neg_cont (self) 57 if (None != neg_cont):
58 neg_cont (self)
58 else: 59 else:
59 pos_cont (self) 60 if (None != pos_cont):
60 return res 61 pos_cont (self)
62 return res
61 def run_once (self, pos_cont, neg_cont): 63 def run_once (self, pos_cont, neg_cont):
62 execs = 0; 64 execs = 0;
63 res = False 65 res = False
diff --git a/src/integration-tests/test_mem_consumption.py b/src/integration-tests/test_mem_consumption.py
index 0233904a4..d70da5493 100755
--- a/src/integration-tests/test_mem_consumption.py
+++ b/src/integration-tests/test_mem_consumption.py
@@ -109,7 +109,7 @@ def run ():
109 success = False 109 success = False
110 110
111 test = Test ('test_memory_consumption', verbose) 111 test = Test ('test_memory_consumption', verbose)
112 server = Peer(test, './confs/c_bootstrap_server.conf'); 112 server = Peer(test, './confs/c_bootstrap_server_w_massif.conf');
113 server.start(); 113 server.start();
114 client = Peer(test, './confs/c_no_nat_client.conf'); 114 client = Peer(test, './confs/c_no_nat_client.conf');
115 client.start(); 115 client.start();