test: remove log&blk tests from the libpmempool_rm group

Signed-off-by: Jan Michalski <jan.michalski@intel.com>
pmem · Jun 26, 2023 · b0be987 · b0be987
1 parent 03e780b
commit b0be987
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/test/libpmempool_rm/TEST0 b/src/test/libpmempool_rm/TEST0
@@ -3,7 +3,7 @@
 # Copyright 2016-2018, Intel Corporation
 #
 #
-# libpmempool_rm/TEST0 -- test for pmempool_rm with single-file pools
+# libpmempool_rm/TEST0 -- test for pmempool_rm with single-file pool
 #
 
 . ../unittest/unittest.sh
@@ -16,21 +16,20 @@ setup
 
 enable_log_append
 
-expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $DIR/pool.blk
-expect_normal_exit $PMEMPOOL$EXESUFFIX create log $DIR/pool.log
-expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $DIR/pool.obj
-check_files $DIR/pool.blk $DIR/pool.log $DIR/pool.obj
+expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $DIR/pool1.obj
+expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $DIR/pool2.obj
+check_files $DIR/pool1.obj $DIR/pool2.obj
 
 # this should remove all the pool files
-expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.blk $DIR/pool.log $DIR/pool.obj
+expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool1.obj $DIR/pool2.obj
 
 # check if all pool files are removed
-check_no_files $DIR/pool.blk $DIR/pool.log $DIR/pool.obj
+check_no_files $DIR/pool1.obj $DIR/pool2.obj
 
 # this should report errors for all files
-expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.blk $DIR/pool.log $DIR/pool.obj
+expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool1.obj $DIR/pool2.obj
 # this should ignore all errors
-expect_normal_exit ./libpmempool_rm$EXESUFFIX -f $DIR/pool.blk $DIR/pool.log $DIR/pool.obj
+expect_normal_exit ./libpmempool_rm$EXESUFFIX -f $DIR/pool1.obj $DIR/pool2.obj
 
 check
 

diff --git a/src/test/libpmempool_rm/out0.log.match b/src/test/libpmempool_rm/out0.log.match
@@ -3,9 +3,8 @@ libpmempool_rm/TEST0: START: libpmempool_rm$(nW)
 libpmempool_rm/TEST0: DONE
 libpmempool_rm/TEST0: START: libpmempool_rm$(nW)
  $(nW)libpmempool_rm$(nW) $(*)
-$(nW)pool.blk: removing file failed: No such file or directory
-$(nW)pool.log: removing file failed: No such file or directory
-$(nW)pool.obj: removing file failed: No such file or directory
+$(nW)pool1.obj: removing file failed: No such file or directory
+$(nW)pool2.obj: removing file failed: No such file or directory
 libpmempool_rm/TEST0: DONE
 libpmempool_rm/TEST0: START: libpmempool_rm$(nW)
  $(nW)libpmempool_rm$(nW) -f $(*)