This is an automated email from the ASF dual-hosted git repository. chetanm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push: new 2acedf5 Always reset WHISK_SERVER property after StandaloneServerTests (#4527) 2acedf5 is described below commit 2acedf5d281ef61cbe128b20799b85c75bf0a26b Author: Martin Henke <martin.he...@web.de> AuthorDate: Sat Jun 29 06:18:32 2019 +0200 Always reset WHISK_SERVER property after StandaloneServerTests (#4527) Only reset the whisk.server property when not defined externally --- .../org/apache/openwhisk/standalone/StandaloneServerFixture.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/src/test/scala/org/apache/openwhisk/standalone/StandaloneServerFixture.scala b/tests/src/test/scala/org/apache/openwhisk/standalone/StandaloneServerFixture.scala index df07b27..2da1a23 100644 --- a/tests/src/test/scala/org/apache/openwhisk/standalone/StandaloneServerFixture.scala +++ b/tests/src/test/scala/org/apache/openwhisk/standalone/StandaloneServerFixture.scala @@ -55,6 +55,8 @@ trait StandaloneServerFixture extends TestSuite with BeforeAndAfterAll with Stre "Wsk Action REST should create and invoke a blocking action resulting in an application error response", "Wsk Action REST should create an action, and invoke an action that returns an empty JSON object") + private val whiskServerPreDefined = System.getProperty(WHISK_SERVER) != null + override def beforeAll(): Unit = { val serverUrlViaSysProp = Option(System.getProperty(WHISK_SERVER)) serverUrlViaSysProp match { @@ -86,8 +88,10 @@ trait StandaloneServerFixture extends TestSuite with BeforeAndAfterAll with Stre override def afterAll(): Unit = { super.afterAll() - if (serverStartedForTest) { + if (!whiskServerPreDefined) { System.clearProperty(WHISK_SERVER) + } + if (serverStartedForTest) { manifestFile.foreach(FileUtils.deleteQuietly) serverProcess.destroy() }