You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/11/24 17:27:39 UTC
[pulsar] branch master updated: [fix][test] Fix flaky test AdditionalServletsTest.testEmptyStringAsExtractionDirectory (#18607)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new bf3ee85bceb [fix][test] Fix flaky test AdditionalServletsTest.testEmptyStringAsExtractionDirectory (#18607)
bf3ee85bceb is described below
commit bf3ee85bceb333378f6c2e1d2b37bd287c8fd89a
Author: Andras Beni <an...@streamnative.io>
AuthorDate: Thu Nov 24 18:27:31 2022 +0100
[fix][test] Fix flaky test AdditionalServletsTest.testEmptyStringAsExtractionDirectory (#18607)
---
.../pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
index 3d708fe9ec0..dd5045b1b09 100644
--- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
+++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
@@ -52,10 +52,8 @@ public class AdditionalServletsTest {
AdditionalServletWithClassLoader as1 = mock(AdditionalServletWithClassLoader.class);
AdditionalServletWithClassLoader as2 = mock(AdditionalServletWithClassLoader.class);
- String originalTmpDirectory = System.getProperty("java.io.tmpdir");
try (MockedStatic<AdditionalServletUtils> utils = mockStatic(AdditionalServletUtils.class)) {
- String tmpDirectory = "/my/tmp/directory";
- System.setProperty("java.io.tmpdir", tmpDirectory);
+ String tmpDirectory = System.getProperty("java.io.tmpdir");
utils.when(() -> AdditionalServletUtils.searchForServlets(
"/additionalServletDirectory", tmpDirectory)).thenReturn(definitions);
utils.when(() -> AdditionalServletUtils.load(asm1, tmpDirectory)).thenReturn(as1);
@@ -65,8 +63,6 @@ public class AdditionalServletsTest {
Assert.assertEquals(servlets.getServlets().get("AS1"), as1);
Assert.assertEquals(servlets.getServlets().get("AS2"), as2);
- } finally {
- System.setProperty("java.io.tmpdir", originalTmpDirectory);
}
}