]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/store_test: BluestoreStatFSTest fixes for issues introduced with bluestore_compr... 11346/head
authorIgor Fedotov <ifedotov@mirantis.com>
Thu, 6 Oct 2016 14:17:40 +0000 (14:17 +0000)
committerIgor Fedotov <ifedotov@mirantis.com>
Thu, 6 Oct 2016 14:17:40 +0000 (14:17 +0000)
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
src/test/objectstore/store_test.cc

index 80df222d861ec57783e68fe3750b2fae87d2963e..3441d8b79f506da45d2e07b7110ea6e6ac77877d 100644 (file)
@@ -1435,9 +1435,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) {
     int r = store->statfs(&statfs);
     ASSERT_EQ(r, 0);
     ASSERT_EQ(0x30005, statfs.stored);
-    ASSERT_EQ(0x20000, statfs.allocated);
+    ASSERT_EQ(0x30000, statfs.allocated);
     ASSERT_LE(statfs.compressed, 0x10000);
-    ASSERT_EQ(0x30000, statfs.compressed_original);
+    ASSERT_EQ(0x20000, statfs.compressed_original);
     ASSERT_EQ(statfs.compressed_allocated, 0x10000);
     //force fsck
     EXPECT_EQ(store->umount(), 0);
@@ -1455,9 +1455,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) {
     int r = store->statfs(&statfs);
     ASSERT_EQ(r, 0);
     ASSERT_EQ(0x30005 - 3 - 9, statfs.stored);
-    ASSERT_EQ(0x20000, statfs.allocated);
+    ASSERT_EQ(0x30000, statfs.allocated);
     ASSERT_LE(statfs.compressed, 0x10000);
-    ASSERT_EQ(0x30000 - 9, statfs.compressed_original);
+    ASSERT_EQ(0x20000 - 9, statfs.compressed_original);
     ASSERT_EQ(statfs.compressed_allocated, 0x10000);
     //force fsck
     EXPECT_EQ(store->umount(), 0);
@@ -1478,9 +1478,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) {
     int r = store->statfs(&statfs);
     ASSERT_EQ(r, 0);
     ASSERT_EQ(0x30001 - 9 + 0x1000, statfs.stored);
-    ASSERT_EQ(0x30000, statfs.allocated);
+    ASSERT_EQ(0x40000, statfs.allocated);
     ASSERT_LE(statfs.compressed, 0x10000);
-    ASSERT_EQ(0x30000 - 9 - 0x1000, statfs.compressed_original);
+    ASSERT_EQ(0x20000 - 9 - 0x1000, statfs.compressed_original);
     ASSERT_EQ(statfs.compressed_allocated, 0x10000);
     //force fsck
     EXPECT_EQ(store->umount(), 0);
@@ -1544,9 +1544,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) {
     r = store->statfs(&statfs);
     ASSERT_EQ(r, 0);
     ASSERT_EQ(0x40000 - 2, statfs.stored);
-    ASSERT_EQ(0x20000, statfs.allocated);
+    ASSERT_EQ(0x30000, statfs.allocated);
     ASSERT_LE(statfs.compressed, 0x10000);
-    ASSERT_EQ(0x30000, statfs.compressed_original);
+    ASSERT_EQ(0x20000, statfs.compressed_original);
     ASSERT_EQ(0x10000, statfs.compressed_allocated);
     //force fsck
     EXPECT_EQ(store->umount(), 0);