From de7710b60bf1ab81881d66a29a4527a4d1f0eab9 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Mon, 26 Jun 2023 11:33:29 -0400 Subject: [PATCH] test: remove log&blk tests from the libpmempool_rm group Signed-off-by: Jan Michalski --- ChangeLog | 3 +-- src/test/libpmempool_rm/TEST0 | 22 ++++++++++------------ src/test/libpmempool_rm/out0.log.match | 2 -- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a30a8c4c8e..b1e55370be9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,7 @@ * Unreleased * This release: - - removes libpmempool API tests that use log/blk/btt pool types (partially) - - removes pmempool check tests that use log/blk/btt pool types + - removes libpmempool tests that use log/blk/btt pool types - ... Wed May 31 2023 Oksana Sałyk diff --git a/src/test/libpmempool_rm/TEST0 b/src/test/libpmempool_rm/TEST0 index e71913efde8..25faf6c93f6 100755 --- a/src/test/libpmempool_rm/TEST0 +++ b/src/test/libpmempool_rm/TEST0 @@ -1,9 +1,9 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2023, 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,19 @@ 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 +check_files $DIR/pool.obj -# this should remove all the pool files -expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.blk $DIR/pool.log $DIR/pool.obj +# this should remove the pool file +expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.obj -# check if all pool files are removed -check_no_files $DIR/pool.blk $DIR/pool.log $DIR/pool.obj +# check if the file is removed +check_no_files $DIR/pool.obj -# this should report errors for all files -expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.blk $DIR/pool.log $DIR/pool.obj +# this should report errors +expect_normal_exit ./libpmempool_rm$EXESUFFIX $DIR/pool.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/pool.obj check diff --git a/src/test/libpmempool_rm/out0.log.match b/src/test/libpmempool_rm/out0.log.match index 4f76dbebf34..5176edd67f7 100644 --- a/src/test/libpmempool_rm/out0.log.match +++ b/src/test/libpmempool_rm/out0.log.match @@ -3,8 +3,6 @@ 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 libpmempool_rm/TEST0: DONE libpmempool_rm/TEST0: START: libpmempool_rm$(nW)