tests: remove device name from blkdiscard output

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/blkdiscard/offsets.err b/tests/expected/blkdiscard/offsets.err
index dbc57dff1ba9d0446aee71183f0cc303b2953cb8..0689712dfc6add8979ca20088a464745ef169632 100644 (file)
--- a/tests/expected/blkdiscard/offsets.err
+++ b/tests/expected/blkdiscard/offsets.err
@@ -1,20 +1,20 @@
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 5242881 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 5243391 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 256 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 513 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 768 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512
-blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 511 is not aligned to sector size 512
+blkdiscard: length 5242881 is not aligned to sector size 512
+blkdiscard: length 5243391 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 511 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 511 is not aligned to sector size 512
+blkdiscard: length 1 is not aligned to sector size 512
+blkdiscard: length 256 is not aligned to sector size 512
+blkdiscard: length 511 is not aligned to sector size 512
+blkdiscard: length 513 is not aligned to sector size 512
+blkdiscard: length 768 is not aligned to sector size 512
+blkdiscard: length 511 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 511 is not aligned to sector size 512
+blkdiscard: length 511 is not aligned to sector size 512
+blkdiscard: offset 1 is not aligned to sector size 512
+blkdiscard: offset 511 is not aligned to sector size 512

diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets
index 24fa8444ed4e90e88967aaa749831aa8d524d9ad..9dddc35e23e0bfd7ff3fa5683179d66f7ef51292 100755 (executable)
--- a/tests/ts/blkdiscard/offsets
+++ b/tests/ts/blkdiscard/offsets
@@ -92,7 +92,7 @@ run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -l 10240 $DEVICE
 run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 10240 $DEVICE
 run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 10240 $DEVICE
 
-sed -i "s#$DEVICE:\s##" $TS_OUTPUT
+sed -i "s#$DEVICE:\s##" $TS_OUTPUT $TS_ERRLOG
 
 ts_log "detach loop device from image"