BIND 10 trac3200, updated. c936de6a262f1509d14c3ce457c5c0b27e86a4e2 [3200] In two additional AssertionFailures, pass the message as parameter.

[BIND 10 source code commits]

The branch, trac3200 has been updated
       via  c936de6a262f1509d14c3ce457c5c0b27e86a4e2 (commit)
      from  e135eb799810f5671b622a2e5d5e4bedf545c049 (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 c936de6a262f1509d14c3ce457c5c0b27e86a4e2
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Oct 22 18:20:33 2013 +0200

    [3200] In two additional AssertionFailures, pass the message as parameter.

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

Summary of changes:
 src/bin/dhcp4/tests/dhcp4_test_utils.cc |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index ad1ae38..5bcf63a 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -348,9 +348,9 @@ Dhcpv4SrvTest::createPacketFromBuffer(const Pkt4Ptr& src_pkt,
     try {
         src_pkt->pack();
     } catch (const Exception& ex) {
-        return (::testing::AssertionFailure() <<
-                "Failed to parse source packet: "
-                << ex.what());
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "Failed to parse source packet: "
+                                            << ex.what()));
     }
     // Get the output buffer from the source packet.
     const util::OutputBuffer& buf = src_pkt->getBuffer();
@@ -360,9 +360,11 @@ Dhcpv4SrvTest::createPacketFromBuffer(const Pkt4Ptr& src_pkt,
         dst_pkt.reset(new Pkt4(static_cast<const uint8_t*>(buf.getData()),
                                buf.getLength()));
     } catch (const Exception& ex) {
-        return (::testing::AssertionFailure()
-                << "Failed to create a destination packet from the buffer: "
-                << ex.what());
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "Failed to create a"
+                                            " destination packet from"
+                                            " the buffer: "
+                                            << ex.what()));
     }
 
     try {