Merge pull request ostreedev#3333 from smcv/gpg-2-2-45

tests: Work around GPG 2.2.45 error behaviour when revoking an expired key
jlebon · Oct 31, 2024 · ab8a7f7 · ab8a7f7
2 parents a35094a + 1d91623
commit ab8a7f7
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/tests/test-remote-gpg-list-keys.sh b/tests/test-remote-gpg-list-keys.sh
@@ -137,8 +137,23 @@ else
 
     echo "ok remote expired key"
 
+    # GPG 2.2.45 fails with exit status 2 when importing a revocation cert
+    # for a key that already expired. https://dev.gnupg.org/T7351
+    may_exit_2 () {
+        local e=0
+        "$@" || e="$?"
+        case "$e" in
+            (0|2)
+                return 0
+                ;;
+            (*)
+                fatal "should have exited with status 0 or 2, not $e: $*"
+                ;;
+        esac
+    }
+
     # Revoke key1 and re-import it.
-    ${GPG} --homedir=${TEST_GPG_KEYHOME} --import ${TEST_GPG_KEYHOME}/revocations/key1.rev
+    may_exit_2 ${GPG} --homedir=${TEST_GPG_KEYHOME} --import ${TEST_GPG_KEYHOME}/revocations/key1.rev
     ${GPG} --homedir=${test_tmpdir}/gpghome --armor --export ${TEST_GPG_KEYID_1} > ${test_tmpdir}/key1revoked.asc
     ${OSTREE} remote gpg-import --keyring ${test_tmpdir}/key1revoked.asc R1
     ${OSTREE} remote gpg-list-keys R1 > result