From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 20 Aug 2015 02:30:37 +0000 (-0400)
Subject: tests: librbd updates for C++11
X-Git-Tag: v10.0.1~52^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cf282a68508cd8cc9ab4caadbc099d4b8270b8f;p=ceph.git

tests: librbd updates for C++11

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc
index 9bc5e8460b78..0f137fe6cbcc 100644
--- a/src/test/librbd/test_ImageWatcher.cc
+++ b/src/test/librbd/test_ImageWatcher.cc
@@ -551,7 +551,7 @@ TEST_F(TestImageWatcher, RequestLock) {
   ASSERT_EQ(0, register_image_watch(*ictx));
 
   register_lock_listener(*ictx);
-  m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+  m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
 
   {
     RWLock::RLocker owner_locker(ictx->owner_lock);
@@ -611,7 +611,7 @@ TEST_F(TestImageWatcher, RequestLockFromPeer) {
   {
     Mutex::Locker l(m_callback_lock);
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
   }
 
   {
@@ -663,7 +663,7 @@ TEST_F(TestImageWatcher, RequestLockTimedOut) {
     Mutex::Locker l(m_callback_lock);
     ASSERT_EQ(0, unlock_image());
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
   }
 
   ASSERT_TRUE(wait_for_notifies(*ictx));
@@ -716,7 +716,7 @@ TEST_F(TestImageWatcher, RequestLockIgnored) {
     Mutex::Locker l(m_callback_lock);
     ASSERT_EQ(0, unlock_image());
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
   }
 
   ASSERT_TRUE(wait_for_notifies(*ictx));
@@ -776,7 +776,7 @@ TEST_F(TestImageWatcher, RequestLockTryLockRace) {
     Mutex::Locker l(m_callback_lock);
     ASSERT_EQ(0, unlock_image());
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, {}}};
   }
 
   ASSERT_EQ(0, m_ioctx.notify2(ictx->header_oid, bl, 5000, NULL));
@@ -785,7 +785,7 @@ TEST_F(TestImageWatcher, RequestLockTryLockRace) {
   {
     Mutex::Locker l(m_callback_lock);
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
   }
 
   {
@@ -834,7 +834,7 @@ TEST_F(TestImageWatcher, RequestLockTryLockFailed) {
     Mutex::Locker l(m_callback_lock);
     ASSERT_EQ(0, unlock_image());
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
   }
 
   ASSERT_TRUE(wait_for_notifies(*ictx));
@@ -1164,7 +1164,7 @@ TEST_F(TestImageWatcher, PeerRequestsLock) {
   ASSERT_EQ(0, register_image_watch(*ictx));
 
   register_lock_listener(*ictx);
-  m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, bufferlist()}};
+  m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
 
   {
     RWLock::RLocker owner_locker(ictx->owner_lock);
@@ -1186,7 +1186,7 @@ TEST_F(TestImageWatcher, PeerRequestsLock) {
   {
     Mutex::Locker l(m_callback_lock);
     m_notifies.clear();
-    m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, bufferlist()}};
+    m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, {}}};
   }
 
   bufferlist bl;