From da065a621571ba680098fa01f947e3a6f2e53de7 Mon Sep 17 00:00:00 2001
From: Yiftach Kaplan <67583323+yift-r3@users.noreply.github.com>
Date: Fri, 14 Aug 2020 15:36:46 +0100
Subject: [PATCH] CORDA-3981: Fix `bad keys are ignored and warned for` (#6636)

The issue with the test was that the environment variable are kept as a static member so it passed if it was the first one to run, but failed if another test runs the config beforehand.
---
 .../corda/node/services/config/ConfigHelperTests.kt  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/node/src/test/kotlin/net/corda/node/services/config/ConfigHelperTests.kt b/node/src/test/kotlin/net/corda/node/services/config/ConfigHelperTests.kt
index 71d1e47283..eacbdf82c3 100644
--- a/node/src/test/kotlin/net/corda/node/services/config/ConfigHelperTests.kt
+++ b/node/src/test/kotlin/net/corda/node/services/config/ConfigHelperTests.kt
@@ -1,6 +1,5 @@
 package net.corda.node.services.config
 
-import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.spy
 import com.nhaarman.mockito_kotlin.verify
 import com.typesafe.config.Config
@@ -11,7 +10,6 @@ import net.corda.node.internal.Node
 import org.junit.After
 import org.junit.Assert
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.mockito.ArgumentMatchers.contains
 import org.slf4j.Logger
@@ -68,7 +66,6 @@ class ConfigHelperTests {
                 "corda.sshd.port" to sshPort.toString())
     }
 
-    @Ignore("CORDA-3981: Logging framework does not appear reliable on Jenkins")
     @Test(timeout = 300_000)
     fun `bad keys are ignored and warned for`() {
         val loggerField = Node::class.java.getDeclaredField("staticLog")
@@ -80,16 +77,11 @@ class ConfigHelperTests {
         val spyLogger = spy(originalLogger)
         loggerField.set(null, spyLogger)
 
-        val baseDirectory = mock<Path>()
-        val configFile = createTempFile()
-        configFile.deleteOnExit()
-        System.setProperty("corda_bad_key", "2077")
-        val config = ConfigHelper.loadConfig(baseDirectory, configFile.toPath())
+        val config = loadConfig("corda_bad_key" to "2077")
 
         verify(spyLogger).warn(contains("(property or environment variable) cannot be mapped to an existing Corda"))
-        assertFalse(config.hasPath("corda_bad_key"))
+        assertFalse(config?.hasPath("corda_bad_key") ?: true)
 
-        System.clearProperty("corda_bad_key")
         loggerField.set(null, originalLogger)
     }