apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

btrfs/006: Fix false alert due to output change

Browse Source 
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>
This commit is contained in:
Su Yue
2017-01-02 22:16:17 -05:00
committed by Eryu Guan
parent 06557299a5
commit 5858c3eb39
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+1 -1
View File
@@ -299,7 +299,7 @@ _filter_scratch_pool()
_filter_spaces()
{
sed -e 's/ [ ]*/ /g'
sed -e "s/\s\+/ /g"
}
_filter_quota()
tests/btrfs/006
+12 -4
View File
@@ -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
tests/btrfs/006.out
+12 -12
View File
@@ -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