From 88e408b8eddc77854be5785c86726b67f814f080 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 23 Mar 2017 16:00:02 +0100 Subject: [PATCH] tests: update to better fit Die is automatic on 'error' result Cleanup everything on 'regular' code path. --- test/shell/dmsetup-keyring.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/test/shell/dmsetup-keyring.sh b/test/shell/dmsetup-keyring.sh index 5ea654ebe..127d2f7b3 100644 --- a/test/shell/dmsetup-keyring.sh +++ b/test/shell/dmsetup-keyring.sh @@ -46,27 +46,30 @@ dmsetup load $PREFIX-crypt --table "0 1 crypt $CIPHER $HEXKEY_32 0 $TESTDIR/dev$ # test dmsetup doesn't hide key descriptions... str=`dmsetup table $PREFIX-crypt | cut -d ' ' -f 5` -test $str = :32:logon:$KEY_NAME || die +test $str = :32:logon:$KEY_NAME str=`dmsetup table --showkeys $PREFIX-crypt | cut -d ' ' -f 5` -test $str = :32:logon:$KEY_NAME || die +test $str = :32:logon:$KEY_NAME # ...but it hides hexbyte representation of keys... str=`dmsetup table --inactive $PREFIX-crypt | cut -d ' ' -f 5` -test $str = $HIDENKEY_32 || die +test $str = $HIDENKEY_32 #...unless --showkeys explictly requested str=`dmsetup table --showkeys --inactive $PREFIX-crypt | cut -d ' ' -f 5` -test $str = $HEXKEY_32 || die +test $str = $HEXKEY_32 # let's swap the tables dmsetup resume $PREFIX-crypt dmsetup load $PREFIX-crypt --table "0 1 crypt $CIPHER :32:logon:$KEY_NAME 0 $TESTDIR/dev$prefix/mapper/$PREFIX-zero 0" str=`dmsetup table --inactive $PREFIX-crypt | cut -d ' ' -f 5` -test $str = :32:logon:$KEY_NAME || die +test $str = :32:logon:$KEY_NAME str=`dmsetup table --showkeys --inactive $PREFIX-crypt | cut -d ' ' -f 5` -test $str = :32:logon:$KEY_NAME || die +test $str = :32:logon:$KEY_NAME str=`dmsetup table $PREFIX-crypt | cut -d ' ' -f 5` -test $str = $HIDENKEY_32 || die +test $str = $HIDENKEY_32 str=`dmsetup table --showkeys $PREFIX-crypt | cut -d ' ' -f 5` -test $str = $HEXKEY_32 || die +test $str = $HEXKEY_32 + +dmsetup remove $PREFIX-crypt +dmsetup remove $PREFIX-zero -- 2.43.5