diff options
| author | Su Yue <suy.fnst@cn.fujitsu.com> | 2017-01-02 22:16:17 -0500 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2017-01-03 11:41:36 +0800 |
| commit | 5858c3eb39aa13b78897ccdcf8daa1b26f20716b (patch) | |
| tree | b7b545aa6e919c4d14eec52faac2384d8b423c92 | |
| parent | 06557299a5edf443df8acf8b54340b3af9072dfc (diff) | |
| download | xfstests-dev-5858c3eb39aa13b78897ccdcf8daa1b26f20716b.tar.gz | |
btrfs/006: Fix false alert due to output change
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.
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rw-r--r-- | common/filter | 2 | ||||
| -rwxr-xr-x | tests/btrfs/006 | 16 | ||||
| -rw-r--r-- | tests/btrfs/006.out | 24 |
3 files changed, 25 insertions, 17 deletions
diff --git a/common/filter b/common/filter index 397b456f64..98eff57333 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 0863394011..d84dfcbd23 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 05b9ac0207..a976972101 100644 --- a/tests/btrfs/006.out +++ b/tests/btrfs/006.out @@ -16,25 +16,25 @@ Label: 'TestLabel.006' uuid: <EXACTUUID> == Sync filesystem == Show device stats by mountpoint <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM> -<NUMDEVS> [SCRATCH_DEV].flush_io_errs <NUM> +<NUMDEVS> [SCRATCH_DEV].flush_io_errs <NUM> <NUMDEVS> [SCRATCH_DEV].generation_errs <NUM> -<NUMDEVS> [SCRATCH_DEV].read_io_errs <NUM> -<NUMDEVS> [SCRATCH_DEV].write_io_errs <NUM> +<NUMDEVS> [SCRATCH_DEV].read_io_errs <NUM> +<NUMDEVS> [SCRATCH_DEV].write_io_errs <NUM> == Show device stats by first/scratch dev [SCRATCH_DEV].corruption_errs <NUM> -[SCRATCH_DEV].flush_io_errs <NUM> +[SCRATCH_DEV].flush_io_errs <NUM> [SCRATCH_DEV].generation_errs <NUM> -[SCRATCH_DEV].read_io_errs <NUM> -[SCRATCH_DEV].write_io_errs <NUM> +[SCRATCH_DEV].read_io_errs <NUM> +[SCRATCH_DEV].write_io_errs <NUM> == 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 |