From a41c27367cfbe9fde370a6590da4926f622ea213 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 17 Oct 2011 09:59:05 +0000 Subject: configure ATS ports conflict-free for tests --- src/core/test_core_api_peer1.conf | 3 ++ src/core/test_core_api_peer2.conf | 3 ++ src/core/test_core_api_send_to_self.conf | 4 +++ ...t_core_quota_asymmetric_recv_limited_peer1.conf | 4 +++ ...t_core_quota_asymmetric_recv_limited_peer2.conf | 4 +++ ...est_core_quota_asymmetric_send_limit_peer1.conf | 5 ++++ ...est_core_quota_asymmetric_send_limit_peer2.conf | 5 ++++ ...t_core_quota_asymmetric_send_limited_peer1.conf | 35 ---------------------- ...t_core_quota_asymmetric_send_limited_peer2.conf | 35 ---------------------- src/core/test_core_quota_peer1.conf | 4 +++ src/core/test_core_quota_peer2.conf | 4 +++ 11 files changed, 36 insertions(+), 70 deletions(-) delete mode 100644 src/core/test_core_quota_asymmetric_send_limited_peer1.conf delete mode 100644 src/core/test_core_quota_asymmetric_send_limited_peer2.conf (limited to 'src') diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index d1ba57a7f..662318a44 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf @@ -25,3 +25,6 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock PORT = 12465 UNIXPATH = /tmp/gnunet-p1-service-transport.sock +[ats] +PORT = 12471 +UNIXPATH = /tmp/gnunet-p1-service-ats.sock diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index 4e5071251..2e848b849 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf @@ -30,3 +30,6 @@ UNIXPATH = /tmp/gnunet-p2-service-transport.sock PORT = 22470 UNIXPATH = /tmp/gnunet-p2-service-core.sock +[ats] +PORT = 22471 +UNIXPATH = /tmp/gnunet-p2-service-ats.sock diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index 8271ea96a..ad3cb1780 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf @@ -13,6 +13,10 @@ TOTAL_QUOTA_IN = 104857600 TOTAL_QUOTA_OUT = 104757600 UNIXPATH = /tmp/gnunet-service-core.sock +[ats] +PORT = 24571 +UNIXPATH = /tmp/gnunet-p1-service-ats.sock + [test-sts] AUTOSTART = YES PORT = 9252 diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index 54ee690e2..b7e92ee84 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf @@ -33,3 +33,7 @@ TOTAL_QUOTA_OUT = 1000000 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock DEBUG = NO +[ats] +PORT = 12491 +UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-ats.sock + diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index a39b69a61..a0d8c6776 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf @@ -33,3 +33,7 @@ TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock DEBUG = NO +[ats] +PORT = 22491 +UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock + diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 8c0542cbf..1056e3471 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf @@ -33,3 +33,8 @@ TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock DEBUG = NO + +[ats] +PORT = 12491 +UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-ats.sock + diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index e2471c9bd..8101f62df 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf @@ -33,3 +33,8 @@ TOTAL_QUOTA_OUT = 1000000 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock DEBUG = NO + +[ats] +PORT = 22491 +UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock + diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf deleted file mode 100644 index 9fed64bd1..000000000 --- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf +++ /dev/null @@ -1,35 +0,0 @@ -@INLINE@ test_core_defaults.conf -[PATHS] -SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/ -DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf - -[transport-tcp] -PORT = 12428 - -[arm] -PORT = 12426 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock - -[statistics] -PORT = 12427 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock - -[resolver] -PORT = 12424 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-resolver.sock - -[peerinfo] -PORT = 12429 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock - -[transport] -PORT = 12425 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock - -[core] -PORT = 12430 -TOTAL_QUOTA_IN = 10240 -TOTAL_QUOTA_OUT = 10240 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock -DEBUG = NO - diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf deleted file mode 100644 index 6a766985c..000000000 --- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf +++ /dev/null @@ -1,35 +0,0 @@ -@INLINE@ test_core_defaults.conf -[PATHS] -SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/ -DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf - -[transport-tcp] -PORT = 22428 - -[arm] -PORT = 22426 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock - -[statistics] -PORT = 22427 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock - -[resolver] -PORT = 22424 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock - -[peerinfo] -PORT = 22429 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock - -[transport] -PORT = 22425 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock - -[core] -PORT = 22430 -TOTAL_QUOTA_IN = 1000000 -TOTAL_QUOTA_OUT = 1000000 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock -DEBUG = NO - diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index 18b806131..78b4a8aac 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf @@ -33,3 +33,7 @@ TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock DEBUG = NO +[ats] +PORT = 12481 +UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock + diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index 52ae44f33..bc64fee00 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf @@ -33,3 +33,7 @@ TOTAL_QUOTA_OUT = 10240 UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock DEBUG = NO +[ats] +PORT = 22482 +UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock + -- cgit v1.2.3