- renaming test_transport_api_multiaddress to test_transport_api_timeout

- adding new timeout tests for http and https

1 files changed, 29 insertions, 28 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a421e089a..a76e74804 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -7,14 +7,14 @@ if HAVE_MHD
 if HAVE_EXPERIMENTAL
  GN_LIBMHD = -lmicrohttpd
  HTTP_PLUGIN_LA = libgnunet_plugin_transport_http.la
-# HTTP_PLUGIN_TEST = test_plugin_transport_http
  HTTP_API_TEST = test_transport_api_http
+ HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
  HTTP_REL_TEST = test_transport_api_reliability_http
  HTTP_QUOTA_TEST = test_quota_compliance_http \
                    test_quota_compliance_http_asymmetric_recv_constant
  HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
-# HTTPS_PLUGIN_TEST = test_plugin_transport_https
  HTTPS_API_TEST = test_transport_api_https
+ HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
  HTTPS_REL_TEST = test_transport_api_reliability_https
  HTTPS_QUOTA_TEST = test_quota_compliance_https \
                 test_quota_compliance_https_asymmetric_recv_constant
@@ -253,17 +253,17 @@ check_PROGRAMS = \
  test_transport_testing \
  test_transport_startonly \
  test_transport_api_disconnect \
- test_transport_api_multiaddress_tcp \
  test_transport_api_tcp \
+ test_transport_api_timeout_tcp \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
  test_transport_api_udp_nat \
- $(HTTP_PLUGIN_TEST) \
  $(HTTP_API_TEST) \
- $(HTTPS_PLUGIN_TEST) \
+ $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
+ $(HTTPS_API_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
@@ -288,17 +288,17 @@ TESTS = \
  test_transport_testing \
  test_transport_startonly \
  test_transport_api_disconnect \
- test_transport_api_multiaddress_tcp \
  test_transport_api_tcp \
+ test_transport_api_timeout_tcp \
  test_transport_api_limited_sockets_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
  $(UNIX_PLUGIN_TEST) \
  test_transport_api_udp_nat \
- $(HTTP_PLUGIN_TEST) \
  $(HTTP_API_TEST) \
- $(HTTPS_PLUGIN_TEST) \
+ $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
+ $(HTTPS_API_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_api_reliability_tcp \
  test_transport_api_reliability_tcp_nat \
@@ -384,14 +384,30 @@ test_transport_api_reliability_tcp_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-test_transport_api_multiaddress_tcp_SOURCES = \
- test_transport_api_multiaddress.c
-test_transport_api_multiaddress_tcp_LDADD = \
+test_transport_api_timeout_tcp_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_tcp_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 = \
+ $(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_https_SOURCES = \
+ test_transport_api_timeout.c
+test_transport_api_timeout_https_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_reliability_tcp_nat_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_nat_LDADD = \
@@ -464,14 +480,6 @@ test_transport_api_reliability_http_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-#test_plugin_transport_https_SOURCES = \
-# test_plugin_transport_https.c
-#test_plugin_transport_https_LDADD = \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# @LIBCURL@ \
-# $(top_builddir)/src/hello/libgnunethello.la \
-# $(top_builddir)/src/util/libgnunetutil.la  
-
 test_transport_api_https_SOURCES = \
  test_transport_api.c
 test_transport_api_https_LDADD = \
@@ -597,12 +605,6 @@ test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-#test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \
-# test_quota_compliance.c
-#test_quota_compliance_udp_asymmetric_send_constant_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la 
-
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
@@ -617,7 +619,6 @@ test_quota_compliance_unix_asymmetric_recv_constant_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-
 test_transport_api_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
@@ -652,8 +653,8 @@ test_transport_api_https_peer1.conf\
 test_transport_api_https_peer2.conf\
 test_transport_api_limited_sockets_tcp_peer1.conf\
 test_transport_api_limited_sockets_tcp_peer2.conf\
-test_transport_api_multiaddress_tcp_peer1.conf\
-test_transport_api_multiaddress_tcp_peer2.conf\
+test_transport_api_timeout_tcp_peer1.conf\
+test_transport_api_timeout_tcp_peer2.conf\
 test_transport_api_multi_peer1.conf\
 test_transport_api_multi_peer2.conf\
 test_transport_api_reliability_http_peer1.conf\