From 3f3c77936e208b042ad6ca413680812b747d29aa Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Wed, 16 Jul 2014 13:09:30 +0000 Subject: QPID-5898: Self tests fail on systems with IPv6 disabled. Temporarily disable tests that assume IPv6 to restore automated testing. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1610992 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/AclHost.cpp | 60 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'qpid/cpp/src/tests/AclHost.cpp') diff --git a/qpid/cpp/src/tests/AclHost.cpp b/qpid/cpp/src/tests/AclHost.cpp index 068b1cae84..5fa87711e5 100644 --- a/qpid/cpp/src/tests/AclHost.cpp +++ b/qpid/cpp/src/tests/AclHost.cpp @@ -38,19 +38,19 @@ QPID_AUTO_TEST_CASE(TestParseTcpIPv4) { BOOST_CHECK_EQUAL(AclHost("1.1.1.1,2.2.2.2").str(), "(1.1.1.1,2.2.2.2)"); } -QPID_AUTO_TEST_CASE(TestParseTcpIPv6) { - BOOST_CHECK_EQUAL(AclHost("[::1]").str(), "([::1],[::1])"); - BOOST_CHECK_EQUAL(AclHost("[::1],::5").str(), "([::1],[::5])"); -} +// QPID_AUTO_TEST_CASE(TestParseTcpIPv6) { +// BOOST_CHECK_EQUAL(AclHost("[::1]").str(), "([::1],[::1])"); +// BOOST_CHECK_EQUAL(AclHost("[::1],::5").str(), "([::1],[::5])"); +// } QPID_AUTO_TEST_CASE(TestParseAll) { BOOST_CHECK_EQUAL(AclHost("").str(), "(all)"); } -QPID_AUTO_TEST_CASE(TestInvalidMixedIpFamilies) { - ACLURL_CHECK_INVALID("1.1.1.1,[::1]"); - ACLURL_CHECK_INVALID("[::1],1.1.1.1"); -} +// QPID_AUTO_TEST_CASE(TestInvalidMixedIpFamilies) { +// ACLURL_CHECK_INVALID("1.1.1.1,[::1]"); +// ACLURL_CHECK_INVALID("[::1],1.1.1.1"); +// } QPID_AUTO_TEST_CASE(TestMalformedIPv4) { ACLURL_CHECK_INVALID("1.1.1.1.1"); @@ -61,7 +61,7 @@ QPID_AUTO_TEST_CASE(TestMalformedIPv4) { QPID_AUTO_TEST_CASE(TestRangeWithInvertedSizeOrder) { ACLURL_CHECK_INVALID("1.1.1.100,1.1.1.1"); - ACLURL_CHECK_INVALID("[FF::1],[::1]"); +// ACLURL_CHECK_INVALID("[FF::1],[::1]"); } QPID_AUTO_TEST_CASE(TestSingleHostResolvesMultipleAddresses) { @@ -73,16 +73,16 @@ QPID_AUTO_TEST_CASE(TestMatchSingleAddresses) { BOOST_CHECK(host1.match("1.1.1.1") == true); BOOST_CHECK(host1.match("1.2.1.1") == false); - AclHost host2("FF::1"); - BOOST_CHECK(host2.match("00FF:0000::1") == true); +// AclHost host2("FF::1"); +// BOOST_CHECK(host2.match("00FF:0000::1") == true); } QPID_AUTO_TEST_CASE(TestMatchMultipleAddresses) { AclHost host1("localhost"); BOOST_CHECK(host1.match("127.0.0.1") == true); - BOOST_CHECK(host1.match("::1") == true); +// BOOST_CHECK(host1.match("::1") == true); BOOST_CHECK(host1.match("128.1.1.1") == false); - BOOST_CHECK(host1.match("::abcd") == false); +// BOOST_CHECK(host1.match("::abcd") == false); } QPID_AUTO_TEST_CASE(TestMatchIPv4Range) { @@ -95,25 +95,25 @@ QPID_AUTO_TEST_CASE(TestMatchIPv4Range) { BOOST_CHECK(host1.match("192.168.255.254") == true); BOOST_CHECK(host1.match("192.168.255.255") == true); BOOST_CHECK(host1.match("192.169.0.0") == false); - BOOST_CHECK(host1.match("::1") == false); +// BOOST_CHECK(host1.match("::1") == false); } -QPID_AUTO_TEST_CASE(TestMatchIPv6Range) { - AclHost host1("::10,::1:0"); - BOOST_CHECK(host1.match("::1") == false); - BOOST_CHECK(host1.match("::f") == false); - BOOST_CHECK(host1.match("::10") == true); - BOOST_CHECK(host1.match("::11") == true); - BOOST_CHECK(host1.match("::ffff") == true); - BOOST_CHECK(host1.match("::1:0") == true); - BOOST_CHECK(host1.match("::1:1") == false); - BOOST_CHECK(host1.match("192.169.0.0") == false); - AclHost host2("[fc00::],[fc00::ff]"); - BOOST_CHECK(host2.match("fc00::") == true); - BOOST_CHECK(host2.match("fc00::1") == true); - BOOST_CHECK(host2.match("fc00::ff") == true); - BOOST_CHECK(host2.match("fc00::100") == false); -} +// QPID_AUTO_TEST_CASE(TestMatchIPv6Range) { +// AclHost host1("::10,::1:0"); +// BOOST_CHECK(host1.match("::1") == false); +// BOOST_CHECK(host1.match("::f") == false); +// BOOST_CHECK(host1.match("::10") == true); +// BOOST_CHECK(host1.match("::11") == true); +// BOOST_CHECK(host1.match("::ffff") == true); +// BOOST_CHECK(host1.match("::1:0") == true); +// BOOST_CHECK(host1.match("::1:1") == false); +// BOOST_CHECK(host1.match("192.169.0.0") == false); +// AclHost host2("[fc00::],[fc00::ff]"); +// BOOST_CHECK(host2.match("fc00::") == true); +// BOOST_CHECK(host2.match("fc00::1") == true); +// BOOST_CHECK(host2.match("fc00::ff") == true); +// BOOST_CHECK(host2.match("fc00::100") == false); +// } QPID_AUTO_TEST_SUITE_END() }} // namespace qpid::tests -- cgit v1.2.1