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