From 7ed6a6a00db04723ccde8e7a2dfb339eed1635bc Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 26 Jan 2016 16:49:39 +0100 Subject: [PATCH] tests: make swaplabel test more robust Signed-off-by: Karel Zak --- tests/expected/misc/swaplabel | 2 +- tests/ts/misc/swaplabel | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel index 13abc0bf8a..172f876afa 100644 --- a/tests/expected/misc/swaplabel +++ b/tests/expected/misc/swaplabel @@ -1,5 +1,5 @@ mkswap: error: swap area needs to be at least 10 pages -mkswap: : insecure permissions 0644, 0600 suggested. +mkswap: : insecure permissions , 0600 suggested. mkswap: Label was truncated. Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes) LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 5653742aa2..6463045087 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -44,6 +44,7 @@ $TS_CMD_MKSWAP \ $IMAGE 2>&1 |\ sed -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \ -e "s:$IMAGE::g" \ + -e "s/insecure permissions [0-9]*/insecure permissions /g" \ >> $TS_OUTPUT 2>&1 rm -f $IMAGE @@ -55,6 +56,7 @@ $TS_CMD_MKSWAP \ sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \ -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \ -e "s:$IMAGE::g" \ + -e "s/insecure permissions [0-9]*/insecure permissions /g" \ >> $TS_OUTPUT 2>&1 $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1 -- 2.47.3