btrfs: Fix _filter_uuid golden output for device replace tests

As a workaround for a regression in the uuid filter introduced by
a092363bbdfa ("xfs: test changing UUID on V5 superblock"), the btrfs
100 and 101 tests included an extra white space before the uuid in their
golden output files. However commit 48613832ad11 ("_filter_uuid: Fix
output regression for btrfs/006"), which came later, fixed the regression
in the uuid filter therefore making btrfs/100 and btrfs/101 fail due to
the extra space in their expected golden output files. So just remove the
extra white spaces from the golden output files.

  $ ./check btrfs/100
  FSTYP         -- btrfs
  PLATFORM      -- Linux/x86_64 debian3 4.2.0-rc5-btrfs-next-13+
  MKFS_OPTIONS  -- /dev/sdc
  MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1

  btrfs/100 4s ... - output mismatch (see .../results//btrfs/100.out.bad)
    --- tests/btrfs/100.out	2015-09-22 02:56:35.031470334 +0100
    +++ /home/fdmanana/git/hub/xfstests/results//btrfs/100.out.bad...
    @@ -1,10 +1,10 @@
     QA output created by 100
    -Label: none  uuid:  <UUID>
    +Label: none  uuid: <UUID>
     	Total devices <NUM> FS bytes used <SIZE>
     	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
     	devid <DEVID> size <SIZE> used <SIZE> path /dev/mapper/error-test

    (...)
  Failures: btrfs/100
  Failed 1 of 1 tests

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/btrfs/100.out b/tests/btrfs/100.out
index 2eeefa4ea76f2041a5e7766b86c996bbf5306601..aa4929197f8d139a03034cd52d89eba5c84b90f1 100644 (file)
--- a/tests/btrfs/100.out
+++ b/tests/btrfs/100.out
@@ -1,10 +1,10 @@
 QA output created by 100
-Label: none  uuid:  <UUID>
+Label: none  uuid: <UUID>
        Total devices <NUM> FS bytes used <SIZE>
        devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
        devid <DEVID> size <SIZE> used <SIZE> path /dev/mapper/error-test
 
-Label: none  uuid:  <UUID>
+Label: none  uuid: <UUID>
        Total devices <NUM> FS bytes used <SIZE>
        devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
 

diff --git a/tests/btrfs/101.out b/tests/btrfs/101.out
index 4621902af832a277d6e51298b6d938d9de247907..e1b88c2dbe7dd4550695994632012ca031b5e0c5 100644 (file)
--- a/tests/btrfs/101.out
+++ b/tests/btrfs/101.out
@@ -1,10 +1,10 @@
 QA output created by 101
-Label: none  uuid:  <UUID>
+Label: none  uuid: <UUID>
        Total devices <NUM> FS bytes used <SIZE>
        devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
        devid <DEVID> size <SIZE> used <SIZE> path /dev/mapper/error-test
 
-Label: none  uuid:  <UUID>
+Label: none  uuid: <UUID>
        Total devices <NUM> FS bytes used <SIZE>
        devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV