8232841: [TESTBUG] [macos] SigningPackageTest fails when untrusted certificates exist on machine
Reviewed-by: herrick, asemenyuk
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
index 6462d67..84e8d49 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -238,6 +238,10 @@
return result.assertExitCodeIs(expectedCode);
}
+ public List<String> executeWithoutExitCodeCheckAndGetOutput() {
+ return saveOutput().executeWithoutExitCodeCheck().getOutput();
+ }
+
private boolean withSavedOutput() {
return saveOutputType.contains(SaveOutputType.FULL) || saveOutputType.contains(
SaveOutputType.FIRST_LINE);
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java
index 3f5db0d..734f7a0 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java
@@ -87,7 +87,7 @@
List<String> result = new Executor()
.setExecutable("security")
.addArguments("dump-trust-settings")
- .executeAndGetOutput();
+ .executeWithoutExitCodeCheckAndGetOutput();
result.stream().forEachOrdered(TKit::trace);
TKit.assertTextStream(name)
.predicate((line, what) -> line.trim().endsWith(what))
