[1914] Fix tests

The fake session didn't want to support hasQueuedMessages properly.
Also, we need to be subscribed to the correct group to actually get the
messages through the session.

diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc
index 423873120bb53f5243abba2e4618a9522cb9d537..2cc6a37751681b9bc2576febdf770a8d589a310c 100644 (file)
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/ccsession_unittests.cc
@@ -722,7 +722,12 @@ protected:
     AsyncReceiveCCSessionTest() :
         mccs_(ccspecfile("spec29.spec"), session, NULL, NULL, false, false),
         next_flag_(0)
-    {}
+    {
+        // This is just to make sure the messages get through the fake
+        // session.
+        session.subscribe("test group");
+        session.subscribe("<ignored>");
+    }
     /// \brief Convenience function to queue a request to get a command
     ///     message.
     ModuleCCSession::AsyncRecvRequestID

diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc
index bf4471dade6c34b00ab61806352b93fd0a251805..65e12cdbe73e60532c7cbabed569eb48cb0536e2 100644 (file)
--- 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 (false);
+    return (messages_ && messages_->size() > 0);
 }
 
 ConstElementPtr