BIND 10 master, updated. a5c587cc3fd3208a875cfaad163cb2cded3309dc Merge branch 'trac1967'

[BIND 10 source code commits]

The branch, master has been updated
       via  a5c587cc3fd3208a875cfaad163cb2cded3309dc (commit)
       via  bb73dd2fdeff8da3a3923541495e14e18556b76a (commit)
       via  edad8ee1e80c5b35c2f5b3eafe82d56cd0d6e5e9 (commit)
       via  7df26862869e043efe8b320d9b0404410f123db0 (commit)
      from  d577a668b1fc70856a3020b4ddbc257f935cd237 (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 a5c587cc3fd3208a875cfaad163cb2cded3309dc
Merge: d577a668b1fc70856a3020b4ddbc257f935cd237 bb73dd2fdeff8da3a3923541495e14e18556b76a
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri May 18 14:38:01 2012 +0200

    Merge branch 'trac1967'

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp6/tests/dhcp6_srv_unittest.cc |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 5b908ee..f4cae66 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -25,6 +25,7 @@
 #include <dhcp6/dhcp6_srv.h>
 #include <util/buffer.h>
 #include <util/range_utilities.h>
+#include <boost/scoped_ptr.hpp>
 
 using namespace std;
 using namespace isc;
@@ -85,9 +86,9 @@ TEST_F(Dhcpv6SrvTest, basic) {
 TEST_F(Dhcpv6SrvTest, DUID) {
     // tests that DUID is generated properly
 
-    Dhcpv6Srv* srv = NULL;
+    boost::scoped_ptr<Dhcpv6Srv> srv;
     ASSERT_NO_THROW( {
-        srv = new Dhcpv6Srv(DHCP6_SERVER_PORT + 10000);
+        srv.reset(new Dhcpv6Srv(DHCP6_SERVER_PORT + 10000));
     });
 
     OptionPtr srvid = srv->getServerID();
@@ -143,18 +144,24 @@ TEST_F(Dhcpv6SrvTest, DUID) {
     }
     case DUID_LL: {
         // not supported yet
-        cout << "Test not implemented for DUID-LL yet." << endl;
+        cout << "Test not implemented for DUID-LL." << endl;
+
+        // No failure here. There's really no way for test LL DUID. It doesn't
+        // even make sense to check if that Link Layer is actually present on
+        // a physical interface. RFC3315 says a server should write its DUID
+        // and keep it despite hardware changes.
+        break;
     }
     case DUID_UUID: // not supported yet
     default:
-        cout << "Not supported duid type=" << duid_type << endl;
-        FAIL();
+        ADD_FAILURE() << "Not supported duid type=" << duid_type << endl;
+        break;
     }
 }
 
-TEST_F(Dhcpv6SrvTest, DISABLED_Solicit_basic) {
-    NakedDhcpv6Srv* srv = NULL;
-    ASSERT_NO_THROW( srv = new NakedDhcpv6Srv(); );
+TEST_F(Dhcpv6SrvTest, Solicit_basic) {
+    boost::scoped_ptr<NakedDhcpv6Srv> srv;
+    ASSERT_NO_THROW( srv.reset(new NakedDhcpv6Srv()) );
 
     // a dummy content for client-id
     OptionBuffer clntDuid(32);
@@ -223,8 +230,6 @@ TEST_F(Dhcpv6SrvTest, DISABLED_Solicit_basic) {
     EXPECT_TRUE(tmp->getData() == srv->getServerID()->getData());
 
     // more checks to be implemented
-    delete srv;
-
 }
 
 }