From cac3e8cabacb7e4b6f0bc680cc0df9af3f775962 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 18 Aug 2018 21:26:45 +0100
Subject: [PATCH v1 4/5] appveyor: PlatformHookWindowsTest: skip
testSetupHttpsCertificate
appveyor doesn't like us tinkering with the root keystore
---
test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java b/test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.java
index cb4cff675..7255cb500 100644
a
|
b
|
import static org.junit.Assert.assertFalse;
|
6 | 6 | import static org.junit.Assert.assertNotNull; |
7 | 7 | import static org.junit.Assert.assertNull; |
8 | 8 | import static org.junit.Assert.assertTrue; |
| 9 | import static org.junit.Assume.assumeFalse; |
9 | 10 | import static org.junit.Assert.fail; |
10 | 11 | |
11 | 12 | import java.io.File; |
… |
… |
public class PlatformHookWindowsTest {
|
88 | 89 | */ |
89 | 90 | @Test |
90 | 91 | public void testSetupHttpsCertificate() throws Exception { |
| 92 | // appveyor doesn't like us tinkering with the root keystore |
| 93 | assumeFalse(PlatformManager.isPlatformWindows() && "True".equals(System.getenv("APPVEYOR"))); |
| 94 | |
91 | 95 | RemoteControlTest.deleteKeystore(); |
92 | 96 | KeyStore ks = RemoteControlHttpsServer.loadJosmKeystore(); |
93 | 97 | TrustedCertificateEntry trustedCert = new KeyStore.TrustedCertificateEntry(ks.getCertificate(ks.aliases().nextElement())); |