Merge branch 'stable-5.11' into stable-5.12
* stable-5.11: [test] Create keystore with the keytool of the running JDK ReachabilityCheckerTestCase: fix reachable from self test case Change-Id: Ie8db450a1fad05bddb812a55b2ceb03b2805403a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
commit
65de0d4863
|
@ -181,9 +181,12 @@ private SslContextFactory createTestSslContextFactory(String hostName) {
|
||||||
tmpDir.deleteOnExit();
|
tmpDir.deleteOnExit();
|
||||||
makePrivate(tmpDir);
|
makePrivate(tmpDir);
|
||||||
File keyStore = new File(tmpDir, "keystore.jks");
|
File keyStore = new File(tmpDir, "keystore.jks");
|
||||||
|
File keytool = new File(
|
||||||
|
new File(new File(System.getProperty("java.home")), "bin"),
|
||||||
|
"keytool");
|
||||||
Runtime.getRuntime().exec(
|
Runtime.getRuntime().exec(
|
||||||
new String[] {
|
new String[] {
|
||||||
"keytool", //
|
keytool.getAbsolutePath(), //
|
||||||
"-keystore", keyStore.getAbsolutePath(), //
|
"-keystore", keyStore.getAbsolutePath(), //
|
||||||
"-storepass", keyPassword,
|
"-storepass", keyPassword,
|
||||||
"-alias", hostName, //
|
"-alias", hostName, //
|
||||||
|
|
|
@ -57,7 +57,7 @@ public void reachable() throws Exception {
|
||||||
assertReachable("reachable from another tip",
|
assertReachable("reachable from another tip",
|
||||||
checker.areAllReachable(Arrays.asList(a), Stream.of(b2)));
|
checker.areAllReachable(Arrays.asList(a), Stream.of(b2)));
|
||||||
assertReachable("reachable from itself",
|
assertReachable("reachable from itself",
|
||||||
checker.areAllReachable(Arrays.asList(a), Stream.of(b2)));
|
checker.areAllReachable(Arrays.asList(a), Stream.of(a)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue