Skip to content

[fix][test] Fix flaky test AdditionalServletsTest.testEmptyStringAsExtractionDirectory #18607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 1 commit into from
Nov 24, 2022
Merged

[fix][test] Fix flaky test AdditionalServletsTest.testEmptyStringAsExtractionDirectory #18607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...mon/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ public void testEmptyStringAsExtractionDirectory() throws IOException {
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);
Expand All @@ -65,8 +63,6 @@ public void testEmptyStringAsExtractionDirectory() throws IOException {

Assert.assertEquals(servlets.getServlets().get("AS1"), as1);
Assert.assertEquals(servlets.getServlets().get("AS2"), as2);
} finally {
System.setProperty("java.io.tmpdir", originalTmpDirectory);
}
}

Expand Down