Skip to content

[MINOR] Fix pki tests condition check on mac #6387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gabriel-Trintinalia merged 7 commits into from
Jan 11, 2024
Merged

[MINOR] Fix pki tests condition check on mac #6387

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93a7c38
Fix pki unit tests on mac - Junit 5
Gabriel-Trintinalia Jan 11, 2024
3dbdbe0
Fix pki unit tests on mac - Junit 5
Gabriel-Trintinalia Jan 11, 2024
d00e643
Fix pki unit tests on mac - Junit 5
Gabriel-Trintinalia Jan 11, 2024
3bce8da
Merge branch 'main' into fix-pki-tests-on-mac
Gabriel-Trintinalia Jan 11, 2024
4b665b4
Fix pki unit tests on mac - Junit 5
Gabriel-Trintinalia Jan 11, 2024
60a2a4f
Merge branch 'fix-pki-tests-on-mac' of https://github.com/Gabriel-Tri…
Gabriel-Trintinalia Jan 11, 2024
66f29c0
Fix pki unit tests on mac - Junit 5
Gabriel-Trintinalia Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreFileWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
import java.nio.file.Path;
import java.security.Provider;
import java.security.Security;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;

import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.OS;
Expand All @@ -37,13 +39,19 @@ public class HardwareKeyStoreFileWrapperTest extends BaseKeyStoreFileWrapperTest
private static final String crl = "/keystore/partner1client1/crl.pem";
private static final String configName = "NSScrypto-partner1client1";
private static final String validKeystorePassword = "test123";
private static KeyStoreWrapperTestParameter keyStoreWrapperTestParameter;

public static Collection<KeyStoreWrapperTestParameter> data() {
return Arrays.asList(
@BeforeAll
public static void setup() {
keyStoreWrapperTestParameter =
new KeyStoreWrapperTestParameter(
"HardwareKeyStoreWrapper[PKCS11 keystore/truststore]",
true,
CryptoTestUtil.isNSSLibInstalled() ? getHardwareKeyStoreWrapper(configName) : null));
CryptoTestUtil.isNSSLibInstalled() ? getHardwareKeyStoreWrapper(configName) : null);
}

public static Collection<KeyStoreWrapperTestParameter> data() {
return List.of(keyStoreWrapperTestParameter);
}

private static KeyStoreWrapper getHardwareKeyStoreWrapper(final String cfgName) {
Expand All @@ -58,11 +66,10 @@ private static KeyStoreWrapper getHardwareKeyStoreWrapper(final String cfgName)
.map(provider -> new HardwareKeyStoreWrapper(validKeystorePassword, provider, crlPath))
.orElseGet(() -> new HardwareKeyStoreWrapper(validKeystorePassword, path, crlPath));
} catch (final Exception e) {
if (OS.MAC.isCurrentOs()) {
// nss3 is difficult to setup on mac correctly, don't let it break unit tests for dev
// machines.
System.out.println("Failed to initialize hardware keystore " + e.getLocalizedMessage());
}
// nss3 is difficult to setup on mac, don't let it break unit tests for dev machines.
Assumptions.assumeFalse(
OS.MAC.isCurrentOs(),
"Failed to initialize hardware keystore: " + e.getLocalizedMessage());
// Not a mac, probably a production build. Full failure.
throw new PkiException("Failed to initialize hardware keystore", e);
}
Expand Down