test: fix errors introduced by rebase to master

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-03-08 10:35:41 -05:00
parent b37f135c64
commit 3982895286
2 changed files with 3 additions and 2 deletions

View File

@ -17,6 +17,7 @@
#include <list>
// template definitions
#include "librbd/Journal.cc"
#include "librbd/exclusive_lock/AcquireRequest.cc"
template class librbd::exclusive_lock::AcquireRequest<librbd::MockImageCtx>;

View File

@ -586,7 +586,7 @@ TEST_F(TestMockJournal, GetCachedClientError) {
librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));
MockImageCtx mock_image_ctx(*ictx);
MockJournalImageCtx mock_image_ctx(*ictx);
MockJournal mock_journal(mock_image_ctx);
expect_op_work_queue(mock_image_ctx);
@ -605,7 +605,7 @@ TEST_F(TestMockJournal, GetTagsError) {
librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));
MockImageCtx mock_image_ctx(*ictx);
MockJournalImageCtx mock_image_ctx(*ictx);
MockJournal mock_journal(mock_image_ctx);
expect_op_work_queue(mock_image_ctx);