diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 09:55:43 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 09:55:43 +0000 |
commit | d11fa474ca382431e4371d9e2ab03283a4e29465 (patch) | |
tree | 85767047cb52f77bc6c30c2bc46883500ee8ef9a /src | |
parent | 741ca3991bd08919fe44ee01bf87caa02a3a8bac (diff) | |
download | gnunet-d11fa474ca382431e4371d9e2ab03283a4e29465.tar.gz gnunet-d11fa474ca382431e4371d9e2ab03283a4e29465.zip |
test conf updates
Diffstat (limited to 'src')
7 files changed, 49 insertions, 41 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 6fb27f067..8ca6bf99a 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -27,19 +27,20 @@ endif | |||
27 | if HAVE_MHD | 27 | if HAVE_MHD |
28 | if HAVE_LIBCURL | 28 | if HAVE_LIBCURL |
29 | HTTP_API_TEST = test_transport_api_http | 29 | HTTP_API_TEST = test_transport_api_http |
30 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | ||
31 | HTTP_REL_TEST = test_transport_api_reliability_http | ||
32 | |||
33 | HTTPS_API_TEST = test_transport_api_https | ||
30 | endif | 34 | endif |
31 | endif | 35 | endif |
32 | 36 | ||
33 | if FALSE | 37 | if FALSE |
34 | HTTP_API_TEST = test_transport_api_http | 38 | |
35 | HTTP_NAT_API_TEST = test_transport_api_http_nat | ||
36 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | ||
37 | HTTP_REL_TEST = test_transport_api_reliability_http | 39 | HTTP_REL_TEST = test_transport_api_reliability_http |
38 | HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat | 40 | HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat |
39 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | 41 | HTTP_QUOTA_TEST = test_quota_compliance_http \ |
40 | test_quota_compliance_http_asymmetric | 42 | test_quota_compliance_http_asymmetric |
41 | 43 | ||
42 | HTTPS_API_TEST = test_transport_api_https | ||
43 | HTTPS_NAT_API_TEST = test_transport_api_https_nat | 44 | HTTPS_NAT_API_TEST = test_transport_api_https_nat |
44 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | 45 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https |
45 | HTTPS_REL_TEST = test_transport_api_reliability_https | 46 | HTTPS_REL_TEST = test_transport_api_reliability_https |
@@ -381,7 +382,6 @@ TESTS = \ | |||
381 | $(UNIX_PLUGIN_TEST) \ | 382 | $(UNIX_PLUGIN_TEST) \ |
382 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ | 383 | $(UNIX_PLUGIN_TIMEOUT_TEST) \ |
383 | test_transport_api_udp_nat \ | 384 | test_transport_api_udp_nat \ |
384 | test_transport_api_http \ | ||
385 | $(HTTP_API_TEST) \ | 385 | $(HTTP_API_TEST) \ |
386 | $(HTTP_NAT_API_TEST) \ | 386 | $(HTTP_NAT_API_TEST) \ |
387 | $(HTTP_API_TIMEOUT_TEST) \ | 387 | $(HTTP_API_TIMEOUT_TEST) \ |
@@ -663,26 +663,42 @@ test_transport_api_unix_LDADD = \ | |||
663 | $(top_builddir)/src/util/libgnunetutil.la \ | 663 | $(top_builddir)/src/util/libgnunetutil.la \ |
664 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 664 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
665 | 665 | ||
666 | # HTTP/S tests | 666 | # HTTP tests |
667 | |||
668 | test_transport_api_http_SOURCES = \ | 667 | test_transport_api_http_SOURCES = \ |
669 | test_transport_api.c | 668 | test_transport_api.c |
670 | test_transport_api_http_LDADD = \ | 669 | test_transport_api_http_LDADD = \ |
671 | $(top_builddir)/src/transport/libgnunettransport.la \ | 670 | $(top_builddir)/src/transport/libgnunettransport.la \ |
672 | $(top_builddir)/src/hello/libgnunethello.la \ | 671 | $(top_builddir)/src/hello/libgnunethello.la \ |
673 | $(top_builddir)/src/util/libgnunetutil.la \ | 672 | $(top_builddir)/src/util/libgnunetutil.la \ |
674 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 673 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
675 | 674 | ||
676 | if FALSE | ||
677 | |||
678 | test_transport_api_timeout_http_SOURCES = \ | 675 | test_transport_api_timeout_http_SOURCES = \ |
679 | test_transport_api_timeout.c | 676 | test_transport_api_timeout.c |
680 | test_transport_api_timeout_http_LDADD = \ | 677 | test_transport_api_timeout_http_LDADD = \ |
681 | $(top_builddir)/src/transport/libgnunettransport.la \ | 678 | $(top_builddir)/src/transport/libgnunettransport.la \ |
682 | $(top_builddir)/src/hello/libgnunethello.la \ | 679 | $(top_builddir)/src/hello/libgnunethello.la \ |
683 | $(top_builddir)/src/util/libgnunetutil.la \ | 680 | $(top_builddir)/src/util/libgnunetutil.la \ |
681 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
682 | |||
683 | test_transport_api_reliability_http_SOURCES = \ | ||
684 | test_transport_api_reliability.c | ||
685 | test_transport_api_reliability_http_LDADD = \ | ||
686 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
687 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
688 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
689 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
690 | |||
691 | # HTTPS tests | ||
692 | test_transport_api_https_SOURCES = \ | ||
693 | test_transport_api.c | ||
694 | test_transport_api_https_LDADD = \ | ||
695 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
696 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
697 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
684 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 698 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
685 | 699 | ||
700 | if FALSE | ||
701 | |||
686 | test_transport_api_timeout_https_SOURCES = \ | 702 | test_transport_api_timeout_https_SOURCES = \ |
687 | test_transport_api_timeout.c | 703 | test_transport_api_timeout.c |
688 | test_transport_api_timeout_https_LDADD = \ | 704 | test_transport_api_timeout_https_LDADD = \ |
@@ -699,14 +715,6 @@ test_transport_api_http_nat_LDADD = \ | |||
699 | $(top_builddir)/src/util/libgnunetutil.la \ | 715 | $(top_builddir)/src/util/libgnunetutil.la \ |
700 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 716 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
701 | 717 | ||
702 | test_transport_api_reliability_http_SOURCES = \ | ||
703 | test_transport_api_reliability.c | ||
704 | test_transport_api_reliability_http_LDADD = \ | ||
705 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
706 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
707 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
708 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
709 | |||
710 | test_transport_api_reliability_http_nat_SOURCES = \ | 718 | test_transport_api_reliability_http_nat_SOURCES = \ |
711 | test_transport_api_reliability.c | 719 | test_transport_api_reliability.c |
712 | test_transport_api_reliability_http_nat_LDADD = \ | 720 | test_transport_api_reliability_http_nat_LDADD = \ |
@@ -715,14 +723,6 @@ test_transport_api_reliability_http_nat_LDADD = \ | |||
715 | $(top_builddir)/src/util/libgnunetutil.la \ | 723 | $(top_builddir)/src/util/libgnunetutil.la \ |
716 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 724 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
717 | 725 | ||
718 | test_transport_api_https_SOURCES = \ | ||
719 | test_transport_api.c | ||
720 | test_transport_api_https_LDADD = \ | ||
721 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
722 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
723 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
724 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
725 | |||
726 | test_transport_api_https_nat_SOURCES = \ | 726 | test_transport_api_https_nat_SOURCES = \ |
727 | test_transport_api.c | 727 | test_transport_api.c |
728 | test_transport_api_https_nat_LDADD = \ | 728 | test_transport_api_https_nat_LDADD = \ |
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index edb99c5f2..377eb9fb9 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h | |||
@@ -30,7 +30,7 @@ | |||
30 | /** | 30 | /** |
31 | * Timeout values for testing | 31 | * Timeout values for testing |
32 | */ | 32 | */ |
33 | #define TESTING GNUNET_YES | 33 | #define TESTING GNUNET_NO |
34 | 34 | ||
35 | #if TESTING | 35 | #if TESTING |
36 | 36 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 0ac73ee2a..b4a3c3db4 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -5,6 +5,8 @@ DEFAULTCONFIG = test_transport_api_http_peer2.conf | |||
5 | 5 | ||
6 | [transport-http_server] | 6 | [transport-http_server] |
7 | PORT = 12090 | 7 | PORT = 12090 |
8 | USE_IPv6 = NO | ||
9 | BINDTO = 127.0.0.1 | ||
8 | 10 | ||
9 | [arm] | 11 | [arm] |
10 | PORT = 12095 | 12 | PORT = 12095 |
@@ -28,4 +30,4 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | |||
28 | PORT = 12091 | 30 | PORT = 12091 |
29 | PLUGINS = http_server | 31 | PLUGINS = http_server |
30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 32 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
31 | #PREFIX = valgrind --leak-check=full | 33 | PREFIX = valgrind --leak-check=full |
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index ebb6e4364..f178b855a 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf | |||
@@ -3,6 +3,8 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf |
5 | 5 | ||
6 | [transport-http_client] | ||
7 | |||
6 | [transport-tcp] | 8 | [transport-tcp] |
7 | TIMEOUT = 5 s | 9 | TIMEOUT = 5 s |
8 | 10 | ||
@@ -27,7 +29,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | |||
27 | 29 | ||
28 | [transport] | 30 | [transport] |
29 | PORT = 12181 | 31 | PORT = 12181 |
30 | PLUGINS = http | 32 | PLUGINS = http_client |
31 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 33 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
32 | #DEBUG = YES | 34 | #DEBUG = YES |
33 | 35 | ||
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index c21fa1d55..b2d1b338c 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf | |||
@@ -3,8 +3,10 @@ | |||
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf |
5 | 5 | ||
6 | [transport-http] | 6 | [transport-http_server] |
7 | PORT = 12190 | 7 | PORT = 12090 |
8 | USE_IPv6 = NO | ||
9 | BINDTO = 127.0.0.1 | ||
8 | 10 | ||
9 | [arm] | 11 | [arm] |
10 | PORT = 12195 | 12 | PORT = 12195 |
@@ -24,7 +26,7 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | |||
24 | 26 | ||
25 | [transport] | 27 | [transport] |
26 | PORT = 12191 | 28 | PORT = 12191 |
27 | PLUGINS = http | 29 | PLUGINS = http_server |
28 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 30 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
29 | #DEBUG = YES | 31 | #DEBUG = YES |
30 | 32 | ||
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index a28750a20..cdfbdd9af 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf | |||
@@ -1,12 +1,11 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer1.conf | 4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf |
5 | 5 | ||
6 | [nat] | 6 | [nat] |
7 | 7 | ||
8 | [transport-http] | 8 | [transport-http_client] |
9 | PORT = 12080 | ||
10 | 9 | ||
11 | [arm] | 10 | [arm] |
12 | PORT = 12085 | 11 | PORT = 12085 |
@@ -28,7 +27,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | |||
28 | [transport] | 27 | [transport] |
29 | #DEBUG = YES | 28 | #DEBUG = YES |
30 | PORT = 12081 | 29 | PORT = 12081 |
31 | PLUGINS = http | 30 | PLUGINS = http_client |
32 | #BINARY = .libs/gnunet-service-transport | 31 | #BINARY = .libs/gnunet-service-transport |
33 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 32 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock |
34 | #PREFIX = valgrind --leak-check=full | 33 | #PREFIX = valgrind --leak-check=full |
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index 12693588a..6edc9e24a 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf | |||
@@ -1,12 +1,15 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer2.conf | 4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf |
5 | 5 | ||
6 | [nat] | 6 | [nat] |
7 | 7 | ||
8 | [transport-http] | 8 | [transport-http_server] |
9 | PORT = 12090 | 9 | PORT = 12090 |
10 | USE_IPv6 = NO | ||
11 | BINDTO = 127.0.0.1 | ||
12 | |||
10 | 13 | ||
11 | [arm] | 14 | [arm] |
12 | PORT = 12095 | 15 | PORT = 12095 |
@@ -28,6 +31,6 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | |||
28 | [transport] | 31 | [transport] |
29 | #DEBUG = YES | 32 | #DEBUG = YES |
30 | PORT = 12091 | 33 | PORT = 12091 |
31 | PLUGINS = http | 34 | PLUGINS = http_server |
32 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 35 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock |
33 | #PREFIX = valgrind --leak-check=full | 36 | #PREFIX = valgrind --leak-check=full |