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