diff --git a/src/test/common_badblock.sh b/src/test/common_badblock.sh
index b008ccd7224675bccc14bc26880e6d997a2931f9..7e4c10de23b8f9bf540349ae72495aeb0ca8daaa 100644
--- a/src/test/common_badblock.sh
+++ b/src/test/common_badblock.sh
@@ -682,11 +682,14 @@ function print_bad_blocks {
#
# expect_bad_blocks -- verify if there are required bad blocks
-# and fail if they are not there
+# in the given namespace and fail if they are not there
+#
+# Input arguments:
+# 1) namespace
#
function expect_bad_blocks {
# XXX sudo should be removed when it is not needed
- sudo ndctl list -M | grep -e "badblock_count" -e "offset" -e "length" >> $LOG && true
+ sudo ndctl list -M -n $1 | grep -e "badblock_count" -e "offset" -e "length" >> $LOG && true
if [ $? -ne 0 ]; then
# XXX sudo should be removed when it is not needed
sudo ndctl list -M &>> $PREP_LOG_FILE && true
@@ -701,12 +704,17 @@ function expect_bad_blocks {
}
#
-# expect_bad_blocks -- verify if there are required bad blocks
-# and fail if they are not there
+# expect_bad_blocks_node -- verify if there are required bad blocks
+# in the given namespace on the given node
+# and fail if they are not there
+#
+# Input arguments:
+# 1) node number
+# 2) namespace
#
function expect_bad_blocks_node {
# XXX sudo should be removed when it is not needed
- expect_normal_exit run_on_node $1 sudo ndctl list -M | \
+ expect_normal_exit run_on_node $1 sudo ndctl list -M -n $2 | \
grep -e "badblock_count" -e "offset" -e "length" >> $LOG \
|| fatal "Error: ndctl failed to inject or retain bad blocks (node $1)"
}
diff --git a/src/test/pmempool_check/TEST31 b/src/test/pmempool_check/TEST31
index 66be7cb6f95008105c94b49dcd9d54b2cfb463d7..627ac9b576ffe99b364a10134c082390f231b026 100755
--- a/src/test/pmempool_check/TEST31
+++ b/src/test/pmempool_check/TEST31
@@ -67,19 +67,19 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
ndctl_uninject_error $FULLDEV $NAMESPACE $FIRST_SECTOR 1
diff --git a/src/test/pmempool_check/TEST32 b/src/test/pmempool_check/TEST32
index 44f62a0bc83e962a922fc5e83a236785163e76eb..f59039a7117389d317f8b216caea0f0f0dfc2113 100755
--- a/src/test/pmempool_check/TEST32
+++ b/src/test/pmempool_check/TEST32
@@ -65,19 +65,19 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
ndctl_uninject_error $FULLDEV $NAMESPACE 11 1
diff --git a/src/test/pmempool_create/TEST10 b/src/test/pmempool_create/TEST10
index 74ec7aa0599fe285b3adf9bd0377d212699a136b..b9c20c187f678fbdee824028bc5a816744b082a6 100755
--- a/src/test/pmempool_create/TEST10
+++ b/src/test/pmempool_create/TEST10
@@ -61,7 +61,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
#
# When the compat feature POOL_FEAT_CHECK_BAD_BLOCKS is enabled by default,
diff --git a/src/test/pmempool_create/TEST11 b/src/test/pmempool_create/TEST11
index 80a2a05103fb94331eeb647e50cfe636b42a54b8..008e0c6ffa938314d0099c1ded279c368d3597ba 100755
--- a/src/test/pmempool_create/TEST11
+++ b/src/test/pmempool_create/TEST11
@@ -67,7 +67,7 @@ create_poolset $POOLSET 10M:$DIR/testfile1:x 10M:$FILE:x 10M:$DIR/testfile2:x
SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 100)
ndctl_inject_error $NAMESPACE $SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
#
# When the compat feature POOL_FEAT_CHECK_BAD_BLOCKS is enabled by default,
diff --git a/src/test/pmempool_create/TEST12 b/src/test/pmempool_create/TEST12
index a5dbdf530002f6756c4048ff0d25cb4c46fadfce..6e47ef04763de3669a636053bfbc4947f34093e4 100755
--- a/src/test/pmempool_create/TEST12
+++ b/src/test/pmempool_create/TEST12
@@ -62,7 +62,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX create obj -b --layout pmempool$SUFFIX $POOLSET >> $LOG"
diff --git a/src/test/pmempool_info/TEST24 b/src/test/pmempool_info/TEST24
index 528f0f9dcd88511c0617c72bc6cfeb6b873aa550..c4ca60f0a9fc7e54df56a096f2ed8d5f7986ffe2 100755
--- a/src/test/pmempool_info/TEST24
+++ b/src/test/pmempool_info/TEST24
@@ -62,7 +62,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit $PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG
diff --git a/src/test/pmempool_info/TEST25 b/src/test/pmempool_info/TEST25
index 99a6537acc13d86d27cc446e95c270c8666a3f04..380f0411ca3cdbf47bceceaba1030b6603397310 100755
--- a/src/test/pmempool_info/TEST25
+++ b/src/test/pmempool_info/TEST25
@@ -64,7 +64,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit $PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG
diff --git a/src/test/pmempool_sync/TEST27 b/src/test/pmempool_sync/TEST27
index 753cba0cce11db64f300d834613a5fcbe77d2e87..10bb77189293d87e87cbfe499999c14229d3b41d 100755
--- a/src/test/pmempool_sync/TEST27
+++ b/src/test/pmempool_sync/TEST27
@@ -74,15 +74,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 8)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST28 b/src/test/pmempool_sync/TEST28
index f5799245ea692aa8b52082c9fb8ca9871ad246df..7ac4aa6f682ad797fbcdc7f3507d355ac7fc1f5d 100755
--- a/src/test/pmempool_sync/TEST28
+++ b/src/test/pmempool_sync/TEST28
@@ -69,15 +69,15 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=0 LEN=1
ndctl_inject_error $NAMESPACE 0 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST30 b/src/test/pmempool_sync/TEST30
index 4c944fddb64961714a0265e304196ef3a3f337f0..ea339806755981f87e392b63f50e6efc58c036ca 100755
--- a/src/test/pmempool_sync/TEST30
+++ b/src/test/pmempool_sync/TEST30
@@ -74,15 +74,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST31 b/src/test/pmempool_sync/TEST31
index 6284d500c24f43048a85cf840890696518d0ddb7..df935e650b77e4b1e51e91cde4b81a2438fd759c 100755
--- a/src/test/pmempool_sync/TEST31
+++ b/src/test/pmempool_sync/TEST31
@@ -69,15 +69,15 @@ turn_on_checking_bad_blocks $POOLSET
# inject bad block: OFF=1000 LEN=1
ndctl_inject_error $NAMESPACE 1000 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
diff --git a/src/test/pmempool_sync/TEST38 b/src/test/pmempool_sync/TEST38
index 7492292c464f76d2f5ca9decb32c89a94ef6475c..0601798952fddd70c65f4286900f063ffc845e23 100755
--- a/src/test/pmempool_sync/TEST38
+++ b/src/test/pmempool_sync/TEST38
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile0 -l 8000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it after clearing bad blocks and before recovering data using gdb
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST39 b/src/test/pmempool_sync/TEST39
index 66aa7771cfdfb540945c73f01bc223524cd336a7..514e9fac33f21df452af0054e44a9880f9e77530 100755
--- a/src/test/pmempool_sync/TEST39
+++ b/src/test/pmempool_sync/TEST39
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it after clearing bad blocks and before recovering data using gdb
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST40 b/src/test/pmempool_sync/TEST40
index 8f6e9b7df10c388ee09221437250878c2e231e2b..a71c319bca020e6dbca0ed91c57dd5b0b4c15025 100755
--- a/src/test/pmempool_sync/TEST40
+++ b/src/test/pmempool_sync/TEST40
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile0 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it during saving bad block recovery files
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync/TEST41 b/src/test/pmempool_sync/TEST41
index a434c9d34c46e830d6dd32823a43d2664ce17286..96c42468fef4aaccf2739ec70af96bc74aff65f8 100755
--- a/src/test/pmempool_sync/TEST41
+++ b/src/test/pmempool_sync/TEST41
@@ -84,15 +84,15 @@ turn_on_checking_bad_blocks $POOLSET
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $MOUNT_DIR/testfile1 -l 1000)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> /dev/null"
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# run sync and break it during saving bad block recovery files
expect_normal_exit gdb --batch \
diff --git a/src/test/pmempool_sync_remote/TEST22 b/src/test/pmempool_sync_remote/TEST22
index c464fca88fe715f8dd6ba3f40b82c2e4b1dbb9d8..e5f11f1458328766ff3fb5b4ddf72d05b601f11c 100755
--- a/src/test/pmempool_sync_remote/TEST22
+++ b/src/test/pmempool_sync_remote/TEST22
@@ -107,11 +107,11 @@ FILE=${MOUNT_DIR}/pool.local
FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST23 b/src/test/pmempool_sync_remote/TEST23
index 69a16111f433dafae81c0928dc5f27e3fbd71372..01da7f1ddd3ea8c1ade898a4e9b9704711e55e3c 100755
--- a/src/test/pmempool_sync_remote/TEST23
+++ b/src/test/pmempool_sync_remote/TEST23
@@ -107,11 +107,11 @@ FILE=${MOUNT_DIR}/pool.local
FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST24 b/src/test/pmempool_sync_remote/TEST24
index d6b8df934735d60908953eb9ed620dee61c2d2f7..c9016de9dda696c31bc9143b36259502b3329e9b 100755
--- a/src/test/pmempool_sync_remote/TEST24
+++ b/src/test/pmempool_sync_remote/TEST24
@@ -112,11 +112,11 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST25 b/src/test/pmempool_sync_remote/TEST25
index 890488c1de38e5406ea16a5aaf37e62031d9f560..ea672e62c843b1ef26411f08aaec0b979d910d5e 100755
--- a/src/test/pmempool_sync_remote/TEST25
+++ b/src/test/pmempool_sync_remote/TEST25
@@ -111,11 +111,11 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 0 ../extents $FILE -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST32 b/src/test/pmempool_sync_remote/TEST32
index c93ee2773ed65f54ebda11aa46e178361b32fc95..01653d7acc48e9a44fb1ba6747ccb7ebe66cfcc8 100755
--- a/src/test/pmempool_sync_remote/TEST32
+++ b/src/test/pmempool_sync_remote/TEST32
@@ -121,11 +121,11 @@ FILE_1=${MOUNT_DIR}/pool.local.part.1
FIRST_SECTOR_1=$(expect_normal_exit run_on_node 0 ../extents $FILE_1 -l 0)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR_1 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST33 b/src/test/pmempool_sync_remote/TEST33
index a7d00edd70bef46c84ae5f1f7b5d81153fbc732a..1163808f7ec80709c8388aa384daae99823dd818 100755
--- a/src/test/pmempool_sync_remote/TEST33
+++ b/src/test/pmempool_sync_remote/TEST33
@@ -121,11 +121,11 @@ FILE_1=${MOUNT_DIR}/pool.local.part.1
FIRST_SECTOR_1=$(expect_normal_exit run_on_node 0 ../extents $FILE_1 -l 1000)
ndctl_inject_error_node 0 $NAMESPACE $FIRST_SECTOR_1 1
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 0
+expect_bad_blocks_node 0 $NAMESPACE
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}$POOLSET_LOCAL &>> $LOG"
expect_normal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}$POOLSET_LOCAL $LAYOUT v &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST34 b/src/test/pmempool_sync_remote/TEST34
index d64e142424f57642f8f7f082d255bf8f8dfef2e7..aab87a3dd6d0a74979c3c119e9a96de6849a7c57 100755
--- a/src/test/pmempool_sync_remote/TEST34
+++ b/src/test/pmempool_sync_remote/TEST34
@@ -111,12 +111,12 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 1 ../extents $FILE -l 0)
ndctl_inject_error_node 1 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# verification should fail
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}/$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# the remote replica contains bad blocks, so it cannot be opened and will be recreated
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}/$POOLSET_LOCAL &>> $LOG"
diff --git a/src/test/pmempool_sync_remote/TEST35 b/src/test/pmempool_sync_remote/TEST35
index 180e0c15958059a9f7bb09a001e4be1705d7fd38..14fe7de1a24c24e29c25b5cc094cf1ce2d44ed52 100755
--- a/src/test/pmempool_sync_remote/TEST35
+++ b/src/test/pmempool_sync_remote/TEST35
@@ -111,12 +111,12 @@ FIRST_SECTOR=$(expect_normal_exit run_on_node 1 ../extents $FILE -l 1000)
ndctl_inject_error_node 1 $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# verification should fail
expect_abnormal_exit run_on_node 0 "../obj_verify ${NODE_DIR[0]}/$POOLSET_LOCAL $LAYOUT v &>> $LOG"
-expect_bad_blocks_node 1
+expect_bad_blocks_node 1 $NAMESPACE
# the remote replica contains bad blocks, so it cannot be opened and will be recreated
expect_normal_exit run_on_node 0 "../pmempool sync -b -v ${NODE_DIR[0]}/$POOLSET_LOCAL &>> $LOG"
diff --git a/src/test/util_badblock/TEST3 b/src/test/util_badblock/TEST3
index fecf34868fe9827d04dafee686922ae4fc2342db..237f643debc2eb6e735f7722f29097d3012754d5 100755
--- a/src/test/util_badblock/TEST3
+++ b/src/test/util_badblock/TEST3
@@ -54,7 +54,7 @@ badblock_test_init dax_device
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FULLDEV l
diff --git a/src/test/util_badblock/TEST4 b/src/test/util_badblock/TEST4
index 36158374fc4341c481f37f0c69dc52258bfd547e..811c74e2d7b38c2d7042b3b0ad7c5ef750d8a902 100755
--- a/src/test/util_badblock/TEST4
+++ b/src/test/util_badblock/TEST4
@@ -55,7 +55,7 @@ badblock_test_init dax_device
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FULLDEV l c l
diff --git a/src/test/util_badblock/TEST6 b/src/test/util_badblock/TEST6
index 941571dc32903f386068603b7fb4cfcc1d7229e9..95f6766fc95277a3ad066c5d5c0c90bb4ffb49b8 100755
--- a/src/test/util_badblock/TEST6
+++ b/src/test/util_badblock/TEST6
@@ -59,7 +59,7 @@ fallocate -l 1M $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
expect_normal_exit ./util_badblock$EXESUFFIX $FILE l
diff --git a/src/test/util_badblock/TEST7 b/src/test/util_badblock/TEST7
index a5dd847b452aeb15fa5f2a07a7a97b5d886ba588..b5816e49e330f9d4f27055d4bd7ec591d7e49531 100755
--- a/src/test/util_badblock/TEST7
+++ b/src/test/util_badblock/TEST7
@@ -60,7 +60,7 @@ fallocate -l 1M $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
enable_log_append
diff --git a/src/test/util_badblock/TEST8 b/src/test/util_badblock/TEST8
index ae4c2d3b75f33b7f28766fd47ae949f9c00599c7..1dc5ceaebdeb837ea1abaf4d4ac919d8076209e8 100755
--- a/src/test/util_badblock/TEST8
+++ b/src/test/util_badblock/TEST8
@@ -59,7 +59,7 @@ turn_on_checking_bad_blocks $FULLDEV
# inject bad block: OFF=11 LEN=1
ndctl_inject_error $NAMESPACE 11 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# open a pool with bad blocks
expect_abnormal_exit ./util_badblock$EXESUFFIX $FULLDEV o
diff --git a/src/test/util_badblock/TEST9 b/src/test/util_badblock/TEST9
index ad43d4c4acdbf6e762823750bb71f1c14b1aa7ab..3b85599c75e20d69b454253132d8d2a25a793391 100755
--- a/src/test/util_badblock/TEST9
+++ b/src/test/util_badblock/TEST9
@@ -64,7 +64,7 @@ turn_on_checking_bad_blocks $FILE
FIRST_SECTOR=$(expect_normal_exit $EXTENTS $FILE -l 0)
ndctl_inject_error $NAMESPACE $FIRST_SECTOR 1
-expect_bad_blocks
+expect_bad_blocks $NAMESPACE
# open a pool with bad blocks
expect_abnormal_exit ./util_badblock$EXESUFFIX $FILE o