diff shell check fix and distro changed

Signed-off-by: Isaac Matthews <[email protected]>
RedHat-SP-Security · Nov 15, 2023 · 249742d · 249742d
1 parent 3915d08
commit 249742d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/functional/iak-idevid-register-with-certificates/main.fmf b/functional/iak-idevid-register-with-certificates/main.fmf
@@ -17,5 +17,5 @@ recommend:
 duration: 5m
 enabled: true
 adjust:
-  - when: distro != fedora-39
+  - when: distro < fedora-39 or distro = centos-stream-9
     enabled: false
diff --git a/functional/iak-idevid-register-with-certificates/test.sh b/functional/iak-idevid-register-with-certificates/test.sh
@@ -122,7 +122,7 @@ rlJournalStart
         # Agent attempts to register and sends all the required information but the CA is not trusted
         # so registration fails at IDevID verification
         rlRun "limeWaitForAgentRegistration ${AGENT_ID}" 1
-        rlAssertGrep "ERROR - No Root CA matched IDevID Certificate" $(limeRegistrarLogfile)
+        rlAssertGrep "ERROR - No Root CA matched IDevID Certificate" "$(limeRegistrarLogfile)"
         rlRun "limeStopAgent"
     rlPhaseEnd
 
@@ -132,12 +132,12 @@ rlJournalStart
         rlRun "limeStartAgent"
         # Agent can now register with IDevID and IAK getting verified
         rlRun "limeWaitForAgentRegistration ${AGENT_ID}"
-        rlAssertGrep "IDevID created" $(limeAgentLogfile)
-        rlAssertGrep "AK certified with IAK" $(limeAgentLogfile)
+        rlAssertGrep "IDevID created" "$(limeAgentLogfile)"
+        rlAssertGrep "AK certified with IAK" "$(limeAgentLogfile)"
         # Check the registrar used the IDevID and IAK code block
-        rlAssertGrep "INFO - IDevID and IAK received" $(limeRegistrarLogfile)
+        rlAssertGrep "INFO - IDevID and IAK received" "$(limeRegistrarLogfile)"
         # Check that the registrar verifies the registering AK against the IAK
-        rlAssertGrep "Agent $AGENT_ID AIK verified with IAK" $(limeRegistrarLogfile)
+        rlAssertGrep "Agent $AGENT_ID AIK verified with IAK" "$(limeRegistrarLogfile)"
     rlPhaseEnd
 
     rlPhaseStartCleanup "Clean up CA, keys and tpm2-openssl"