From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from cn.fujitsu.com ([59.151.112.132]:26949 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753711AbdACDQW (ORCPT ); Mon, 2 Jan 2017 22:16:22 -0500 From: Su Yue Subject: [PATCH v2] fstests: btrfs/006: Fix false alert due to output change Date: Mon, 2 Jan 2017 22:16:17 -0500 Message-ID: <20170103031617.439-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Sender: fstests-owner@vger.kernel.org To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org List-ID: Btrfs-progs v4.9 changed "device status" output by adding one more space, which differs from golden output. Fix it by using filter '_filter_spaces' to convert multi space into one. --- v2: Changed the '_filter_spaces' to match both Tab and Space and tested all related tests. --- common/filter | 2 +- tests/btrfs/006 | 16 ++++++++++++---- tests/btrfs/006.out | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/common/filter b/common/filter index 397b456..98eff57 100644 --- a/common/filter +++ b/common/filter @@ -299,7 +299,7 @@ _filter_scratch_pool() _filter_spaces() { - sed -e 's/ [ ]*/ /g' + sed -e "s/\s\+/ /g" } _filter_quota() diff --git a/tests/btrfs/006 b/tests/btrfs/006 index 0863394..d84dfcb 100755 --- a/tests/btrfs/006 +++ b/tests/btrfs/006 @@ -82,13 +82,21 @@ echo "== Sync filesystem" $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT > /dev/null echo "== Show device stats by mountpoint" -$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_btrfs_device_stats $TOTAL_DEVS +$BTRFS_UTIL_PROG device stats $SCRATCH_MNT | \ + _filter_btrfs_device_stats $TOTAL_DEVS | \ + _filter_spaces echo "== Show device stats by first/scratch dev" -$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | _filter_btrfs_device_stats +$BTRFS_UTIL_PROG device stats $SCRATCH_DEV | \ + _filter_btrfs_device_stats | \ + _filter_spaces echo "== Show device stats by second dev" -$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g" +$BTRFS_UTIL_PROG device stats $FIRST_POOL_DEV | \ + sed -e "s,$FIRST_POOL_DEV,FIRST_POOL_DEV,g" | \ + _filter_spaces echo "== Show device stats by last dev" -$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g" +$BTRFS_UTIL_PROG device stats $LAST_POOL_DEV | \ + sed -e "s,$LAST_POOL_DEV,LAST_POOL_DEV,g" | \ + _filter_spaces # success, all done status=0 diff --git a/tests/btrfs/006.out b/tests/btrfs/006.out index 05b9ac0..a976972 100644 --- a/tests/btrfs/006.out +++ b/tests/btrfs/006.out @@ -16,25 +16,25 @@ Label: 'TestLabel.006' uuid: == Sync filesystem == Show device stats by mountpoint [SCRATCH_DEV].corruption_errs - [SCRATCH_DEV].flush_io_errs + [SCRATCH_DEV].flush_io_errs [SCRATCH_DEV].generation_errs - [SCRATCH_DEV].read_io_errs - [SCRATCH_DEV].write_io_errs + [SCRATCH_DEV].read_io_errs + [SCRATCH_DEV].write_io_errs == Show device stats by first/scratch dev [SCRATCH_DEV].corruption_errs -[SCRATCH_DEV].flush_io_errs +[SCRATCH_DEV].flush_io_errs [SCRATCH_DEV].generation_errs -[SCRATCH_DEV].read_io_errs -[SCRATCH_DEV].write_io_errs +[SCRATCH_DEV].read_io_errs +[SCRATCH_DEV].write_io_errs == Show device stats by second dev -[FIRST_POOL_DEV].write_io_errs 0 -[FIRST_POOL_DEV].read_io_errs 0 -[FIRST_POOL_DEV].flush_io_errs 0 +[FIRST_POOL_DEV].write_io_errs 0 +[FIRST_POOL_DEV].read_io_errs 0 +[FIRST_POOL_DEV].flush_io_errs 0 [FIRST_POOL_DEV].corruption_errs 0 [FIRST_POOL_DEV].generation_errs 0 == Show device stats by last dev -[LAST_POOL_DEV].write_io_errs 0 -[LAST_POOL_DEV].read_io_errs 0 -[LAST_POOL_DEV].flush_io_errs 0 +[LAST_POOL_DEV].write_io_errs 0 +[LAST_POOL_DEV].read_io_errs 0 +[LAST_POOL_DEV].flush_io_errs 0 [LAST_POOL_DEV].corruption_errs 0 [LAST_POOL_DEV].generation_errs 0 -- 2.9.3