[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26637 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26637 - gnunet/src/transport |
|
Date: |
Thu, 28 Mar 2013 13:29:16 +0100 |
Author: wachs
Date: 2013-03-28 13:29:16 +0100 (Thu, 28 Mar 2013)
New Revision: 26637
Added:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/test_transport_blacklisting.c
Log:
additional test
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2013-03-28 12:27:15 UTC (rev 26636)
+++ gnunet/src/transport/Makefile.am 2013-03-28 12:29:16 UTC (rev 26637)
@@ -323,11 +323,6 @@
$(HTTP_SERVER_PLUGIN_TEST) \
$(HTTPS_SERVER_PLUGIN_TEST) \
test_transport_api_blacklisting \
- test_transport_blacklisting_no_bl \
- test_transport_blacklisting_outbound_bl_full \
- test_transport_blacklisting_outbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_full \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
@@ -348,6 +343,12 @@
$(HTTPS_API_TIMEOUT_TEST) \
$(WLAN_API_TEST) \
test_transport_api_multi \
+ test_transport_blacklisting_no_bl \
+ test_transport_blacklisting_outbound_bl_full \
+ test_transport_blacklisting_outbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_full \
+ test_transport_blacklisting_multiple_plugins \
test_transport_api_manipulation_send_tcp \
test_transport_api_manipulation_recv_tcp \
test_transport_api_reliability_tcp \
@@ -378,11 +379,6 @@
$(UNIX_TEST) \
$(WLAN_PLUGIN_TEST) \
test_transport_api_blacklisting \
- test_transport_blacklisting_no_bl \
- test_transport_blacklisting_outbound_bl_full \
- test_transport_blacklisting_outbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_plugin \
- test_transport_blacklisting_inbound_bl_full \
test_transport_api_disconnect_tcp \
test_transport_api_bidirectional_connect \
test_transport_api_tcp \
@@ -402,6 +398,12 @@
$(HTTPS_API_TIMEOUT_TEST) \
$(WLAN_API_TEST) \
test_transport_api_multi \
+ test_transport_blacklisting_no_bl \
+ test_transport_blacklisting_outbound_bl_full \
+ test_transport_blacklisting_outbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_plugin \
+ test_transport_blacklisting_inbound_bl_full \
+ test_transport_blacklisting_multiple_plugins \
test_transport_api_manipulation_send_tcp \
test_transport_api_manipulation_recv_tcp \
test_transport_api_reliability_tcp \
@@ -499,6 +501,16 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
+test_transport_blacklisting_multiple_plugins_SOURCES = \
+ test_transport_blacklisting.c
+test_transport_blacklisting_multiple_plugins_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+
test_transport_api_disconnect_tcp_SOURCES = \
test_transport_api_disconnect.c
test_transport_api_disconnect_tcp_LDADD = \
@@ -1031,5 +1043,7 @@
test_transport_blacklisting_cfg_blp_peer1_plugin.conf \
test_transport_blacklisting_cfg_blp_peer2_full.conf\
test_transport_blacklisting_cfg_blp_peer2_plugin.conf \
+test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf \
+test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf \
test_transport_api_http_reverse_peer1.conf \
test_transport_api_http_reverse_peer2.conf
Modified: gnunet/src/transport/test_transport_blacklisting.c
===================================================================
--- gnunet/src/transport/test_transport_blacklisting.c 2013-03-28 12:27:15 UTC
(rev 26636)
+++ gnunet/src/transport/test_transport_blacklisting.c 2013-03-28 12:29:16 UTC
(rev 26637)
@@ -242,7 +242,23 @@
p2 =
GNUNET_TRANSPORT_TESTING_start_peer (tth,
"test_transport_blacklisting_cfg_blp_peer2_plugin.conf", 2,
NULL, NULL, NULL, &start_cb, NULL);
}
+ else if (0 == strcmp(test_name,
"test_transport_blacklisting_multiple_plugins"))
+ {
+ p1 =
GNUNET_TRANSPORT_TESTING_start_peer (tth,
"test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf", 1,
+ NULL, NULL, NULL,
&start_cb, NULL);
+ p2 =
GNUNET_TRANSPORT_TESTING_start_peer (tth,
"test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf", 2,
+
NULL, NULL, NULL, &start_cb, NULL);
+ }
+
+
+ if ((NULL == p1) || (NULL == p2))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to
start peers\n");
+ ok = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ }
+
timeout_task = GNUNET_SCHEDULER_add_delayed
(CONNECT_TIMEOUT, &connect_timeout, NULL);
stage ++;
return;
@@ -270,7 +286,8 @@
(GNUNET_NO == started) ? "NOT STARTED" : "STARTED",
(GNUNET_YES == connected) ? "CONNECTED" : "NOT CONNECTED");
- if (0 == strcmp(test_name, "test_transport_blacklisting_no_bl"))
+ if ((0 == strcmp(test_name, "test_transport_blacklisting_no_bl")) ||
+ (0 == strcmp(test_name,
"test_transport_blacklisting_multiple_plugins")))
{
if ((GNUNET_NO != started) && (GNUNET_YES == connected))
ok = 0;
Added:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
(rev 0)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
2013-03-28 12:29:16 UTC (rev 26637)
@@ -0,0 +1,34 @@
address@hidden@ template_cfg_peer1.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-tcp-p1/
+
+[transport-tcp]
+PORT = 12000
+TIMEOUT = 5 s
+
+[arm]
+PORT = 12005
+DEFAULTSERVICES = transport
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12004
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12003
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12002
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+#PREFIX = valgrind --leak-check=full
+PORT = 12001
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+PLUGINS = tcp udp
+
+[transport-blacklist-AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520]
+P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G
= tcp
+
\ No newline at end of file
Added:
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
===================================================================
---
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
(rev 0)
+++
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
2013-03-28 12:29:16 UTC (rev 26637)
@@ -0,0 +1,33 @@
address@hidden@ template_cfg_peer2.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-tcp-p2/
+
+[transport-tcp]
+PORT = 12015
+TIMEOUT = 5 s
+
+[arm]
+PORT = 12014
+DEFAULTSERVICES = transport
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12013
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12012
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12011
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+#PREFIX = valgrind --leak-check=full
+PORT = 12010
+PLUGINS = tcp udp
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
+[transport-blacklist-P565723JO1C2HSN6J29TAQ22MN6CI8HTMUU55T0FUQG4CMDGGEQ8UCNBKUMB94GC8R9G4FB2SF9LDOBAJ6AMINBP4JHHDD6L7VD801G]
+AG2PHES1BARB9IJCPAMJTFPVJ5V3A72S3F2A8SBUB8DAQ2V0O3V8G6G2JU56FHGFOHMQVKBSQFV98TCGTC3RJ1NINP82G0RC00N1520
= tcp udp
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26637 - gnunet/src/transport,
gnunet <=