]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: update librbd AIO tests to remove result code
authorJason Dillaman <dillaman@redhat.com>
Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 24 Jul 2015 13:59:56 +0000 (09:59 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Conflicts:
src/test/librbd/test_librbd.cc: trivial resolution

src/test/librbd/test_librbd.cc

index c37d884624d3794e2cb6e967a714bccad138801a..6d1d050622a56f754c30f3d349d02c5dafeadc2a 100644 (file)
@@ -750,8 +750,16 @@ TEST(LibRBD, TestIO)
   ASSERT_EQ(10, rbd_write(image, info.size - 10, 100, test_data));
 
   rbd_aio_create_completion(NULL, (rbd_callback_t) simple_read_cb, &comp);
-  ASSERT_EQ(-EINVAL, rbd_aio_write(image, info.size, 1, test_data, comp));
-  ASSERT_EQ(-EINVAL, rbd_aio_read(image, info.size, 1, test_data, comp));
+  ASSERT_EQ(0, rbd_aio_write(image, info.size, 1, test_data, comp));
+  ASSERT_EQ(0, rbd_aio_wait_for_complete(comp));
+  ASSERT_EQ(-EINVAL, rbd_aio_get_return_value(comp));
+  rbd_aio_release(comp);
+
+  rbd_aio_create_completion(NULL, (rbd_callback_t) simple_read_cb, &comp);
+  ASSERT_EQ(0, rbd_aio_read(image, info.size, 1, test_data, comp));
+  ASSERT_EQ(0, rbd_aio_wait_for_complete(comp));
+  ASSERT_EQ(-EINVAL, rbd_aio_get_return_value(comp));
+  rbd_aio_release(comp);
 
   ASSERT_EQ(0, rbd_close(image));