- new test

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 988e2fed7952945bf3f8037dba122cd5946cdb9b..5aaf217e6a7e4dc29670c568fc7523638d8df718 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -54,6 +54,7 @@ endif
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
 UNIX_PLUGIN_TEST = test_transport_api_unix 
+UNIX_PLUGIN_TIMEOUT_TEST = test_transport_api_timeout_unix
 UNIX_REL_TEST = test_transport_api_unreliability_unix
 UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric
@@ -260,6 +261,7 @@ check_PROGRAMS = \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
+ test_transport_api_timeout_unix \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -302,6 +304,7 @@ TESTS = \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
+ test_transport_api_timeout_unix \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
  $(HTTP_NAT_API_TEST) \
@@ -439,6 +442,14 @@ test_transport_api_timeout_tcp_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_transport_api_timeout_unix_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_unix_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
 test_transport_api_timeout_http_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_http_LDADD = \
@@ -766,6 +777,8 @@ test_transport_api_udp_peer1.conf\
 test_transport_api_udp_peer2.conf\
 test_transport_api_unix_peer1.conf\
 test_transport_api_unix_peer2.conf\
+test_transport_api_timeout_unix_peer1.conf\
+test_transport_api_timeout_unix_peer2.conf\
 test_transport_api_unreliability_udp_peer1.conf\
 test_transport_api_unreliability_udp_peer2.conf\
 test_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 (file)
index 0000000..b1ace7d
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_unix_peer1.conf
@@ -0,0 +1,29 @@
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-unix-p1/
+DEFAULTCONFIG = test_transport_api_unix_peer1.conf
+
+[arm]
+PORT = 12125
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12124
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12123
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12122
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12121
+PLUGINS = unix
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
+[transport-unix]
+PORT = 12120
+

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 (file)
index 0000000..a153588
--- /dev/null
+++ b/src/transport/test_transport_api_timeout_unix_peer2.conf
@@ -0,0 +1,29 @@
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-unix-p2/
+DEFAULTCONFIG = test_transport_api_unix_peer2.conf
+
+[arm]
+PORT = 12135
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12134
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12133
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12132
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 12131
+PLUGINS = unix
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
+[transport-unix]
+PORT = 12136
+