From 01f79ef854d5742d72052350e1ce92c2feccdbf2 Mon Sep 17 00:00:00 2001 From: Karel Srot Date: Thu, 18 May 2023 09:27:09 +0200 Subject: [PATCH] Update test to work with v3.21.0 --- .../runtest.sh | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Sanity/pkcsslotd-to-create-lock-and-log-directories/runtest.sh b/Sanity/pkcsslotd-to-create-lock-and-log-directories/runtest.sh index 1c77c05..b803b51 100755 --- a/Sanity/pkcsslotd-to-create-lock-and-log-directories/runtest.sh +++ b/Sanity/pkcsslotd-to-create-lock-and-log-directories/runtest.sh @@ -45,34 +45,38 @@ rlJournalStart rlRun "rlImport opencryptoki/token-manipulation" 2> import.log || rlDie "Could not import opencryptoki/token-manipulation library" # need library path so we can import it as a test user LIBPATH=`grep 'Will try to import opencryptoki\/token-manipulation from' import.log | sed 's/^.*token-manipulation from//'` - echo "LIBPATH=$LIBPATH" + echo "LIBPATH=$LIBPATH" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" - rlServiceStop pkcsslotd + rlServiceStop pkcsslotd + pkcsResetTokens rlFileBackup --clean /var/lib/opencryptoki /var/log/opencryptoki $LOCKDIR/opencryptoki # avoid using /var/lock symlink to properly test bug 1373833 - if [ "$LOCKDIR" == "/run/lock" ]; then - [ -L /var/lock ] && rlFileBackup /var/lock && rlRun "rm -f /var/lock" - fi + if [ "$LOCKDIR" == "/run/lock" ]; then + [ -L /var/lock ] && rlFileBackup /var/lock && rlRun "rm -f /var/lock" + fi rlRun "useradd -m $USER -G pkcs11" rlPhaseEnd + # skip this one for opencryptoki 3.21.0 as since then the service is running as a regular user + if nvrTestPackage opencryptoki '<' 3.21.0; then rlPhaseStartTest "testing directory creation during pkcsslotd start" - rlRun "rm -rf /var/log/opencryptoki $LOCKDIR/opencryptoki" - rlRun "pkcsResetTokens" + rlRun "rm -rf /var/log/opencryptoki $LOCKDIR/opencryptoki" + rlRun "pkcsResetTokens" rlServiceStart pkcsslotd - rlAssertExists /var/log/opencryptoki - rlAssertExists $LOCKDIR/opencryptoki - rlRun "matchpathcon /var/log/opencryptoki" - rlRun "matchpathcon $LOCKDIR/opencryptoki" - rlRun "su $USER -c 'pkcsconf -t' &> query1.log" + rlAssertExists /var/log/opencryptoki + rlAssertExists $LOCKDIR/opencryptoki + rlRun "matchpathcon /var/log/opencryptoki" + rlRun "matchpathcon $LOCKDIR/opencryptoki" + rlRun "su $USER -c 'pkcsconf -t' &> query1.log" cat query1.log if nvrTestPackage opencryptoki '<' 3.14.0; then - rlAssertGrep "Model: IBM SoftTok" query1.log + rlAssertGrep "Model: IBM SoftTok" query1.log else rlAssertGrep "Model: Soft " query1.log fi rlPhaseEnd + fi # initialize every token available for SLOT in `sed -n 's/^Token #\([0-9]\).*/\1/gp' query1.log`; do