BIND 10 track1914, updated. 6d4b2e6b54ae93bcd438e253573b62c11535b436 [1914] More test fixes

[BIND 10 source code commits]

The branch, track1914 has been updated
       via  6d4b2e6b54ae93bcd438e253573b62c11535b436 (commit)
      from  a2be2f5cfe81a85df13a0ea977af6a9bddf3040b (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 6d4b2e6b54ae93bcd438e253573b62c11535b436
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu May 17 17:51:19 2012 +0200

    [1914] More test fixes
    
    The queued messages still didn't work well.
    
    Removed a problem with logging error triggered in older parts of code.

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

Summary of changes:
 src/lib/config/ccsession.cc                 |    8 +++++---
 src/lib/config/tests/ccsession_unittests.cc |    8 ++++++--
 src/lib/config/tests/fake_session.cc        |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index bcabd39..cfb7e4b 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -818,11 +818,13 @@ ModuleCCSession::checkAsyncRecv(const ConstElementPtr& envelope,
                     requests_.erase(request_);
                 }
             private:
-                AsyncRecvRequests requests_;
-                AsyncRecvRequestID request_;
-            } deleter(async_recv_requests_, request);
+                AsyncRecvRequests& requests_;
+                AsyncRecvRequestID& request_;
+            };
+            RequestDeleter deleter(async_recv_requests_, request);
             // Call the callback
             request->callback(envelope, msg, request);
+            return (true);
         }
     }
     return (false);
diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc
index 2cc6a37..7762544 100644
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/ccsession_unittests.cc
@@ -727,6 +727,10 @@ protected:
         // session.
         session.subscribe("test group");
         session.subscribe("<ignored>");
+        // Get rid of all unrelated stray messages
+        while (session.getMsgQueue()->size() > 0) {
+            session.getMsgQueue()->remove(0);
+        }
     }
     /// \brief Convenience function to queue a request to get a command
     ///     message.
@@ -779,7 +783,7 @@ private:
 // Test we can receive a command, without anything fancy yet
 TEST_F(AsyncReceiveCCSessionTest, simpleCommand) {
     // Push the message inside
-    ConstElementPtr msg(el("{}"));
+    ConstElementPtr msg(el("{\"command\": [\"bla\"]}"));
     session.addMessage(msg, "test group", "<unused>");
     EXPECT_TRUE(mccs_.hasQueuedMsgs());
     // Register the callback
@@ -805,7 +809,7 @@ TEST_F(AsyncReceiveCCSessionTest, simpleCommand) {
 // Very similar to simpleCommand, but with a response message
 TEST_F(AsyncReceiveCCSessionTest, simpleResponse) {
     // Push the message inside
-    ConstElementPtr msg(el("{}"));
+    ConstElementPtr msg(el("{\"result\": [0]}"));
     session.addMessage(msg, "<ignored>", "<unused>", 1);
     EXPECT_TRUE(mccs_.hasQueuedMsgs());
     // Register the callback
diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc
index 65e12cd..34309c1 100644
--- a/src/lib/config/tests/fake_session.cc
+++ b/src/lib/config/tests/fake_session.cc
@@ -207,7 +207,7 @@ FakeSession::reply(ConstElementPtr envelope, ConstElementPtr newmsg) {
 
 bool
 FakeSession::hasQueuedMsgs() const {
-    return (messages_ && messages_->size() > 0);
+    return (msg_queue_ && msg_queue_->size() > 0);
 }
 
 ConstElementPtr