Merge pull request #560 from PetrJanouch/1.7_flaky_test_fix

Fixing flaky tests

Author: zhenlineo

driver/src/test/java/org/neo4j/driver/v1/integration/TrustCustomCertificateIT.java

@@ -18,10 +18,16 @@
  */
 package org.neo4j.driver.v1.integration;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.function.Supplier;
 
 import org.neo4j.driver.v1.Config;
@@ -42,11 +48,32 @@
 import static org.neo4j.driver.v1.util.CertificateToolUtil.createNewCertificateAndKeySignedBy;
 
 @ParallelizableIT
-public class TrustCustomCertificateIT
+class TrustCustomCertificateIT
 {
     @RegisterExtension
     static final DatabaseExtension neo4j = new DatabaseExtension();
 
+    private static Path originalKeyFile;
+    private static Path originalCertFile;
+
+    @BeforeAll
+    static void beforeAll() throws IOException
+    {
+        originalKeyFile = Files.createTempFile( "key-file-", "" );
+        originalCertFile = Files.createTempFile( "cert-file-", "" );
+
+        Files.copy( neo4j.tlsKeyFile().toPath(), originalKeyFile , StandardCopyOption.REPLACE_EXISTING);
+        Files.copy( neo4j.tlsCertFile().toPath(), originalCertFile, StandardCopyOption.REPLACE_EXISTING );
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception
+    {
+        neo4j.updateEncryptionKeyAndCert( originalKeyFile.toFile(), originalCertFile.toFile() );
+        Files.deleteIfExists( originalKeyFile );
+        Files.deleteIfExists( originalCertFile );
+    }
+
     @Test
     void shouldAcceptServerWithCertificateSignedByDriverCertificate() throws Throwable
     {