test: cleanup pmempool_[!check] from depracated tests

Signed-off-by: Jan Michalski <jan.michalski@intel.com>
pmem · Jun 28, 2023 · 5e1e291 · 5e1e291
1 parent d42a50d
commit 5e1e291
Show file tree

Hide file tree

Showing 37 changed files with 42 additions and 1,073 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
 
 	This release:
 	- removes libpmempool tests that use log/blk/btt pool types
+	- removes pmempool tests that use log/blk/btt pool types
 	- removes other misc tests using pmempool with log/blk/btt pool types
 	- ...
 

diff --git a/src/test/pmempool_dump/TEST0 b/src/test/pmempool_dump/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2023, Intel Corporation
 #
 #
 # pmempool_dump/TEST0 -- test for dump command
@@ -16,13 +16,18 @@ setup
 
 POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
+ERR=err${UNITTEST_NUM}.log
 rm -f $LOG && touch $LOG
 
-expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL
+expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL
 expect_normal_exit $PMEMWRITE$EXESUFFIX $POOL TEST
-expect_normal_exit $PMEMPOOL$EXESUFFIX dump -b -o $LOG $POOL
+expect_abnormal_exit $PMEMPOOL$EXESUFFIX dump -b -o $LOG $POOL 2> $ERR
+cat $ERR >> $LOG
+rm $ERR
 echo >> $LOG
-expect_normal_exit $PMEMPOOL$EXESUFFIX dump -b $POOL >> $LOG
+expect_abnormal_exit $PMEMPOOL$EXESUFFIX dump -b $POOL >> $LOG 2> $ERR
+cat $ERR >> $LOG
+rm $ERR
 echo >> $LOG
 
 check

diff --git a/src/test/pmempool_dump/out0.log.match b/src/test/pmempool_dump/out0.log.match
@@ -1,2 +1,4 @@
-TEST
-TEST
+error: $(nW)/file.pool: PMEMOBJ pool not supported
+
+error: $(nW)/file.pool: PMEMOBJ pool not supported
+
diff --git a/src/test/pmempool_info/TEST0 b/src/test/pmempool_info/TEST0
diff --git a/src/test/pmempool_info/TEST1 b/src/test/pmempool_info/TEST1
diff --git a/src/test/pmempool_info/TEST16 b/src/test/pmempool_info/TEST16
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2023, Intel Corporation
 #
 #
 # pmempool_info/TEST16 -- test for info command
@@ -40,14 +40,6 @@ create_poolset $POOLREP 32M:$POOL1:z 32M:$POOL2:z 32M:$POOL3:z\
 	R 32M:$REPL1:z 32M:$REPL2:z 32M:$REPL3:z
 check_file $POOLREP
 
-rm -f $POOLS
-expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOLSET
-expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET >> $LOG
-
-rm -f $POOLS
-expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET
-expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET >> $LOG
-
 rm -f $POOLS $REPS
 expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOLREP
 expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLREP >> $LOG

diff --git a/src/test/pmempool_info/TEST2 b/src/test/pmempool_info/TEST2
diff --git a/src/test/pmempool_info/TEST27 b/src/test/pmempool_info/TEST27
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2023, Intel Corporation
 #
 #
 # pmempool_info/TEST27 -- test for arch string inside info
@@ -18,7 +18,7 @@ POOL=$DIR/file.pool
 LOG=out${UNITTEST_NUM}.log
 rm -f $LOG && touch $LOG
 
-expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL
+expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL
 expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL >> $LOG
 
 check

diff --git a/src/test/pmempool_info/TEST3 b/src/test/pmempool_info/TEST3
diff --git a/src/test/pmempool_info/TEST4 b/src/test/pmempool_info/TEST4
diff --git a/src/test/pmempool_info/TEST5 b/src/test/pmempool_info/TEST5
diff --git a/src/test/pmempool_info/TEST6 b/src/test/pmempool_info/TEST6
diff --git a/src/test/pmempool_info/TEST7 b/src/test/pmempool_info/TEST7
diff --git a/src/test/pmempool_info/TEST8 b/src/test/pmempool_info/TEST8
diff --git a/src/test/pmempool_info/TEST9 b/src/test/pmempool_info/TEST9