BIND 10 master, updated. 2275e0d7afa15b69bd7511616a6ebae0b9de0d22 Changelog for #523
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Mar 4 09:04:01 UTC 2011
The branch, master has been updated
via 2275e0d7afa15b69bd7511616a6ebae0b9de0d22 (commit)
via 301da7d26d41e64d87c0cf72727f3347aa61fb40 (commit)
via 8c7144c6aef7eb26215f045ee95551ed7a6fe307 (commit)
from 87829d23b5d698611c94ee92f758558d8ad95468 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2275e0d7afa15b69bd7511616a6ebae0b9de0d22
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Mar 4 10:01:30 2011 +0100
Changelog for #523
commit 301da7d26d41e64d87c0cf72727f3347aa61fb40
Merge: 87829d23b5d698611c94ee92f758558d8ad95468 8c7144c6aef7eb26215f045ee95551ed7a6fe307
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Fri Mar 4 09:58:11 2011 +0100
Merge branch 'work/ports/tests'
commit 8c7144c6aef7eb26215f045ee95551ed7a6fe307
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Feb 28 14:39:28 2011 +0100
[trac523] Change test ports to 53210
This is in the private range, so it should not conflict with anything
(we still might be unlucky if two tests run at the same time, but the
chance is low).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
src/bin/auth/benchmarks/query_bench.cc | 2 +-
src/bin/auth/tests/auth_srv_unittest.cc | 2 +-
src/lib/asiolink/tests/io_endpoint_unittest.cc | 6 +++---
src/lib/asiolink/tests/io_service_unittest.cc | 2 +-
src/lib/testutils/portconfig.h | 12 ++++++------
src/lib/testutils/srv_test.cc | 4 ++--
7 files changed, 19 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index cd3db95..695c78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+ 185. [bug] vorner
+ Tests use port from private range (53210), lowering chance of
+ a conflict with something else (eg. running bind 10).
+ (Trac #523, git 301da7d26d41e64d87c0cf72727f3347aa61fb40)
+
184. [func]* vorner
Listening address and port configuration of b10-auth is the same as
for b10-resolver now. That means, it is configured through bindctl
diff --git a/src/bin/auth/benchmarks/query_bench.cc b/src/bin/auth/benchmarks/query_bench.cc
index 7f643f3..5e69134 100644
--- a/src/bin/auth/benchmarks/query_bench.cc
+++ b/src/bin/auth/benchmarks/query_bench.cc
@@ -77,7 +77,7 @@ protected:
dummy_socket(IOSocket::getDummyUDPSocket()),
dummy_endpoint(IOEndpointPtr(IOEndpoint::create(IPPROTO_UDP,
IOAddress("192.0.2.1"),
- 5300)))
+ 53210)))
{}
public:
unsigned int run() {
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 54dc0c7..379342e 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -644,7 +644,7 @@ TEST_F(AuthSrvTest, queryCounterUnexpected) {
// Modify the message.
delete io_message;
endpoint = IOEndpoint::create(IPPROTO_UDP,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
+ IOAddress(DEFAULT_REMOTE_ADDRESS), 53210);
io_message = new IOMessage(request_renderer.getData(),
request_renderer.getLength(),
getDummyUnknownSocket(), *endpoint);
diff --git a/src/lib/asiolink/tests/io_endpoint_unittest.cc b/src/lib/asiolink/tests/io_endpoint_unittest.cc
index 534850a..6101473 100644
--- a/src/lib/asiolink/tests/io_endpoint_unittest.cc
+++ b/src/lib/asiolink/tests/io_endpoint_unittest.cc
@@ -22,9 +22,9 @@ using namespace asiolink;
TEST(IOEndpointTest, createUDPv4) {
const IOEndpoint* ep;
- ep = IOEndpoint::create(IPPROTO_UDP, IOAddress("192.0.2.1"), 5300);
+ ep = IOEndpoint::create(IPPROTO_UDP, IOAddress("192.0.2.1"), 53210);
EXPECT_EQ("192.0.2.1", ep->getAddress().toText());
- EXPECT_EQ(5300, ep->getPort());
+ EXPECT_EQ(53210, ep->getPort());
EXPECT_EQ(AF_INET, ep->getFamily());
EXPECT_EQ(AF_INET, ep->getAddress().getFamily());
EXPECT_EQ(IPPROTO_UDP, ep->getProtocol());
@@ -62,7 +62,7 @@ TEST(IOEndpointTest, createTCPv6) {
TEST(IOEndpointTest, createIPProto) {
EXPECT_THROW(IOEndpoint::create(IPPROTO_IP, IOAddress("192.0.2.1"),
- 5300)->getAddress().toText(),
+ 53210)->getAddress().toText(),
IOError);
}
diff --git a/src/lib/asiolink/tests/io_service_unittest.cc b/src/lib/asiolink/tests/io_service_unittest.cc
index 28924d4..779d03e 100644
--- a/src/lib/asiolink/tests/io_service_unittest.cc
+++ b/src/lib/asiolink/tests/io_service_unittest.cc
@@ -28,7 +28,7 @@ const char* const TEST_IPV4_ADDR = "127.0.0.1";
TEST(IOServiceTest, badPort) {
IOService io_service;
EXPECT_THROW(DNSService(io_service, *"65536", true, false, NULL, NULL, NULL), IOError);
- EXPECT_THROW(DNSService(io_service, *"5300.0", true, false, NULL, NULL, NULL), IOError);
+ EXPECT_THROW(DNSService(io_service, *"53210.0", true, false, NULL, NULL, NULL), IOError);
EXPECT_THROW(DNSService(io_service, *"-1", true, false, NULL, NULL, NULL), IOError);
EXPECT_THROW(DNSService(io_service, *"domain", true, false, NULL, NULL, NULL), IOError);
}
diff --git a/src/lib/testutils/portconfig.h b/src/lib/testutils/portconfig.h
index 486b256..8e61ffc 100644
--- a/src/lib/testutils/portconfig.h
+++ b/src/lib/testutils/portconfig.h
@@ -51,8 +51,8 @@ listenAddresses(Server& server) {
// Try putting there some addresses
AddressList addresses;
- addresses.push_back(AddressPair("127.0.0.1", 5321));
- addresses.push_back(AddressPair("::1", 5321));
+ addresses.push_back(AddressPair("127.0.0.1", 53210));
+ addresses.push_back(AddressPair("::1", 53210));
server.setListenAddresses(addresses);
EXPECT_EQ(2, server.getListenAddresses().size());
EXPECT_EQ("::1", server.getListenAddresses()[1].first);
@@ -85,7 +85,7 @@ listenAddressConfig(Server& server) {
"\"listen_on\": ["
" {"
" \"address\": \"127.0.0.1\","
- " \"port\": 5321"
+ " \"port\": 53210"
" }"
"]"
"}"));
@@ -93,7 +93,7 @@ listenAddressConfig(Server& server) {
EXPECT_EQ(result->toWire(), isc::config::createAnswer()->toWire());
ASSERT_EQ(1, server.getListenAddresses().size());
EXPECT_EQ("127.0.0.1", server.getListenAddresses()[0].first);
- EXPECT_EQ(5321, server.getListenAddresses()[0].second);
+ EXPECT_EQ(53210, server.getListenAddresses()[0].second);
// As this is example address, the machine should not have it on
// any interface
@@ -101,7 +101,7 @@ listenAddressConfig(Server& server) {
"\"listen_on\": ["
" {"
" \"address\": \"192.0.2.0\","
- " \"port\": 5321"
+ " \"port\": 53210"
" }"
"]"
"}");
@@ -109,7 +109,7 @@ listenAddressConfig(Server& server) {
EXPECT_FALSE(result->equals(*isc::config::createAnswer()));
ASSERT_EQ(1, server.getListenAddresses().size());
EXPECT_EQ("127.0.0.1", server.getListenAddresses()[0].first);
- EXPECT_EQ(5321, server.getListenAddresses()[0].second);
+ EXPECT_EQ(53210, server.getListenAddresses()[0].second);
}
diff --git a/src/lib/testutils/srv_test.cc b/src/lib/testutils/srv_test.cc
index c0d6e0f..4fec4ca 100644
--- a/src/lib/testutils/srv_test.cc
+++ b/src/lib/testutils/srv_test.cc
@@ -60,7 +60,7 @@ SrvTestBase::createDataFromFile(const char* const datafile,
delete endpoint;
endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
+ IOAddress(DEFAULT_REMOTE_ADDRESS), 53210);
UnitTestUtil::readWireData(datafile, data);
io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
&IOSocket::getDummyTCPSocket();
@@ -76,7 +76,7 @@ SrvTestBase::createRequestPacket(Message& message,
delete io_message;
endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
+ IOAddress(DEFAULT_REMOTE_ADDRESS), 53210);
io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
&IOSocket::getDummyTCPSocket();
io_message = new IOMessage(request_renderer.getData(),
More information about the bind10-changes
mailing list