From ca4ecc5e2805d9d486492b49ca31217c6b3ad27f Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 25 Oct 2017 22:03:17 -0400 Subject: [PATCH] test/librbd: fixed metadata tests under upgrade scenarios Fixes: http://tracker.ceph.com/issues/21910 Signed-off-by: Jason Dillaman --- src/test/librbd/test_librbd.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index 01a8c59730e5c..47562f6f929c5 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -3954,7 +3954,8 @@ TEST_F(TestLibRBD, Metadata) ASSERT_STREQ(vals + strlen(vals) + 1, "value2"); ASSERT_EQ(0, rbd_metadata_remove(image1, "key1")); - ASSERT_EQ(0, rbd_metadata_remove(image1, "key3")); + int r = rbd_metadata_remove(image1, "key3"); + ASSERT_TRUE(r == 0 || r == -ENOENT); value_len = sizeof(value); ASSERT_EQ(-ENOENT, rbd_metadata_get(image1, "key3", value, &value_len)); ASSERT_EQ(0, rbd_metadata_list(image1, "", 0, keys, &keys_len, vals, @@ -4119,7 +4120,8 @@ TEST_F(TestLibRBD, MetadataPP) pairs.clear(); ASSERT_EQ(0, image1.metadata_remove("key1")); - ASSERT_EQ(0, image1.metadata_remove("key3")); + int r= image1.metadata_remove("key3"); + ASSERT_TRUE(r == 0 || r == -ENOENT); ASSERT_TRUE(image1.metadata_get("key3", &value) < 0); ASSERT_EQ(0, image1.metadata_list("", 0, &pairs)); ASSERT_EQ(1U, pairs.size()); -- 2.39.5