From 04b1106098f9a0b2a78c71bba782148be2e6fa8f Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 11 Feb 2025 16:32:37 +0100 Subject: [PATCH] Reenable disabled test and add workaround for broken one --- .../pgpainless/sop/CarolKeySignEncryptRoundtripTest.java | 2 -- .../pgpainless/operation/PGPainlessRevokeKeyTest.java | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/CarolKeySignEncryptRoundtripTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/CarolKeySignEncryptRoundtripTest.java index d994c9bc..83778106 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/CarolKeySignEncryptRoundtripTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/CarolKeySignEncryptRoundtripTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import java.io.IOException; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import sop.ByteArrayAndResult; import sop.DecryptionResult; @@ -16,7 +15,6 @@ import sop.EncryptionResult; import sop.ReadyWithResult; import sop.testsuite.assertions.VerificationListAssert; -@Disabled("Carol is an ElGamal key, which are no longer supported.") public class CarolKeySignEncryptRoundtripTest { private static final String CAROL_KEY = "-----BEGIN PGP PRIVATE KEY BLOCK-----\n" + diff --git a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessRevokeKeyTest.java b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessRevokeKeyTest.java index b7590b7a..5567d3e0 100644 --- a/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessRevokeKeyTest.java +++ b/pgpainless-sop/src/test/java/sop/testsuite/pgpainless/operation/PGPainlessRevokeKeyTest.java @@ -4,6 +4,7 @@ package sop.testsuite.pgpainless.operation; +import static java.lang.Thread.sleep; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,6 +29,11 @@ public class PGPainlessRevokeKeyTest extends RevokeKeyTest { super.revokeUnprotectedKey(sop); byte[] key = sop.generateKey().generate().getBytes(); + try { + sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } byte[] revokedKey = sop.revokeKey().keys(key).getBytes(); PGPKeyRing certificate = PGPainless.readKeyRing().keyRing(revokedKey);