aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-02-23 16:04:24 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-02-23 16:04:24 +0000
commit01ea8ec64f49908cd2ecba54a88d1310d4bff2f8 (patch)
tree4220cc8773678bbec6b6601ca76e35c7f272eacc /src/transport
parent3136ab7fb0203540499e59f1796f113aab41af62 (diff)
downloadgnunet-01ea8ec64f49908cd2ecba54a88d1310d4bff2f8.tar.gz
gnunet-01ea8ec64f49908cd2ecba54a88d1310d4bff2f8.zip
- new test
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/Makefile.am13
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer1.conf29
-rw-r--r--src/transport/test_transport_api_timeout_unix_peer2.conf29
3 files changed, 71 insertions, 0 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 988e2fed7..5aaf217e6 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -54,6 +54,7 @@ endif
54if !MINGW 54if !MINGW
55UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la 55UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
56UNIX_PLUGIN_TEST = test_transport_api_unix 56UNIX_PLUGIN_TEST = test_transport_api_unix
57UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
57UNIX_REL_TEST = test_transport_api_unreliability_unix 58UNIX_REL_TEST = test_transport_api_unreliability_unix
58UNIX_QUOTA_TEST = test_quota_compliance_unix \ 59UNIX_QUOTA_TEST = test_quota_compliance_unix \
59 test_quota_compliance_unix_asymmetric 60 test_quota_compliance_unix_asymmetric
@@ -260,6 +261,7 @@ check_PROGRAMS = \
260 test_transport_api_tcp_nat \ 261 test_transport_api_tcp_nat \
261 test_transport_api_udp \ 262 test_transport_api_udp \
262 $(UNIX_PLUGIN_TEST) \ 263 $(UNIX_PLUGIN_TEST) \
264 test_transport_api_timeout_unix \
263 test_transport_api_udp_nat \ 265 test_transport_api_udp_nat \
264 $(HTTP_API_TEST) \ 266 $(HTTP_API_TEST) \
265 $(HTTP_NAT_API_TEST) \ 267 $(HTTP_NAT_API_TEST) \
@@ -302,6 +304,7 @@ TESTS = \
302 test_transport_api_tcp_nat \ 304 test_transport_api_tcp_nat \
303 test_transport_api_udp \ 305 test_transport_api_udp \
304 $(UNIX_PLUGIN_TEST) \ 306 $(UNIX_PLUGIN_TEST) \
307 test_transport_api_timeout_unix \
305 test_transport_api_udp_nat \ 308 test_transport_api_udp_nat \
306 $(HTTP_API_TEST) \ 309 $(HTTP_API_TEST) \
307 $(HTTP_NAT_API_TEST) \ 310 $(HTTP_NAT_API_TEST) \
@@ -439,6 +442,14 @@ test_transport_api_timeout_tcp_LDADD = \
439 $(top_builddir)/src/util/libgnunetutil.la \ 442 $(top_builddir)/src/util/libgnunetutil.la \
440 $(top_builddir)/src/transport/libgnunettransporttesting.la 443 $(top_builddir)/src/transport/libgnunettransporttesting.la
441 444
445test_transport_api_timeout_unix_SOURCES = \
446 test_transport_api_timeout.c
447test_transport_api_timeout_unix_LDADD = \
448 $(top_builddir)/src/transport/libgnunettransport.la \
449 $(top_builddir)/src/hello/libgnunethello.la \
450 $(top_builddir)/src/util/libgnunetutil.la \
451 $(top_builddir)/src/transport/libgnunettransporttesting.la
452
442test_transport_api_timeout_http_SOURCES = \ 453test_transport_api_timeout_http_SOURCES = \
443 test_transport_api_timeout.c 454 test_transport_api_timeout.c
444test_transport_api_timeout_http_LDADD = \ 455test_transport_api_timeout_http_LDADD = \
@@ -766,6 +777,8 @@ test_transport_api_udp_peer1.conf\
766test_transport_api_udp_peer2.conf\ 777test_transport_api_udp_peer2.conf\
767test_transport_api_unix_peer1.conf\ 778test_transport_api_unix_peer1.conf\
768test_transport_api_unix_peer2.conf\ 779test_transport_api_unix_peer2.conf\
780test_transport_api_timeout_unix_peer1.conf\
781test_transport_api_timeout_unix_peer2.conf\
769test_transport_api_unreliability_udp_peer1.conf\ 782test_transport_api_unreliability_udp_peer1.conf\
770test_transport_api_unreliability_udp_peer2.conf\ 783test_transport_api_unreliability_udp_peer2.conf\
771test_transport_api_unreliability_unix_peer1.conf\ 784test_transport_api_unreliability_unix_peer1.conf\
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf
new file mode 100644
index 000000000..b1ace7d4c
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -0,0 +1,29 @@
1@INLINE@ template_cfg_peer1.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p1/
4DEFAULTCONFIG = test_transport_api_unix_peer1.conf
5
6[arm]
7PORT = 12125
8UNIXPATH = /tmp/gnunet-p1-service-arm.sock
9
10[statistics]
11PORT = 12124
12UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
13
14[resolver]
15PORT = 12123
16UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
17
18[peerinfo]
19PORT = 12122
20UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
21
22[transport]
23PORT = 12121
24PLUGINS = unix
25UNIXPATH = /tmp/gnunet-p1-service-transport.sock
26
27[transport-unix]
28PORT = 12120
29
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf
new file mode 100644
index 000000000..a15358844
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -0,0 +1,29 @@
1@INLINE@ template_cfg_peer2.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-unix-p2/
4DEFAULTCONFIG = test_transport_api_unix_peer2.conf
5
6[arm]
7PORT = 12135
8UNIXPATH = /tmp/gnunet-p2-service-arm.sock
9
10[statistics]
11PORT = 12134
12UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
13
14[resolver]
15PORT = 12133
16UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
17
18[peerinfo]
19PORT = 12132
20UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
21
22[transport]
23PORT = 12131
24PLUGINS = unix
25UNIXPATH = /tmp/gnunet-p2-service-transport.sock
26
27[transport-unix]
28PORT = 12136
29