From 4abb659c185cd545dc9799815668f5fe179941ec Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Oct 2019 16:57:24 +0200 Subject: [PATCH] tests: remove device name from blkdiscard output Signed-off-by: Karel Zak --- tests/expected/blkdiscard/offsets.err | 40 +++++++++++++-------------- tests/ts/blkdiscard/offsets | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/expected/blkdiscard/offsets.err b/tests/expected/blkdiscard/offsets.err index dbc57dff1b..0689712dfc 100644 --- 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 24fa8444ed..9dddc35e23 100755 --- 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" -- 2.47.2