Skip to content

Delete temp jars in classfile tests sooner #93019

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
merged 1 commit into from
Jan 18, 2023
Merged

Delete temp jars in classfile tests sooner #93019

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions libs/plugin-scanner/src/test/java/org/elasticsearch/plugin/scanner/ClassReadersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.plugin.scanner;

import org.elasticsearch.core.IOUtils;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.compiler.InMemoryJavaCompiler;
import org.elasticsearch.test.jar.JarUtils;
Expand Down Expand Up @@ -39,6 +40,9 @@ public void testModuleInfoIsNotReturnedAsAClassFromJar() throws IOException {

List<ClassReader> classReaders = ClassReaders.ofPaths(Stream.of(jar));
org.hamcrest.MatcherAssert.assertThat(classReaders, Matchers.empty());

// aggressively delete the jar dir, so that any leaked filed handles fail this specific test on windows
IOUtils.rm(tmp);
}

public void testTwoClassesInAStreamFromJar() throws IOException {
Expand All @@ -57,6 +61,9 @@ public class B {}
List<ClassReader> classReaders = ClassReaders.ofPaths(Stream.of(jar));
List<String> collect = classReaders.stream().map(cr -> cr.getClassName()).collect(Collectors.toList());
org.hamcrest.MatcherAssert.assertThat(collect, Matchers.containsInAnyOrder("p/A", "p/B"));

// aggressively delete the jar dir, so that any leaked filed handles fail this specific test on windows
IOUtils.rm(tmp);
}

public void testStreamOfJarsAndIndividualClasses() throws IOException {
Expand Down
7 changes: 7 additions & 0 deletions ...in-scanner/src/test/java/org/elasticsearch/plugin/scanner/NamedComponentScannerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.plugin.scanner;

import org.elasticsearch.core.IOUtils;
import org.elasticsearch.plugin.scanner.test_model.ExtensibleClass;
import org.elasticsearch.plugin.scanner.test_model.ExtensibleInterface;
import org.elasticsearch.plugin.scanner.test_model.TestNamedComponent;
Expand Down Expand Up @@ -100,6 +101,9 @@ public class B implements ExtensibleInterface{}
)
)
);

// aggressively delete the jar dir, so that any leaked filed handles fail this specific test on windows
IOUtils.rm(tmp);
}

public void testNamedComponentsCanExtednCommonSuperClass() throws IOException {
Expand Down Expand Up @@ -174,6 +178,9 @@ public class B implements CustomExtensibleInterface{}
)
)
);

// aggressively delete the jar dir, so that any leaked filed handles fail this specific test on windows
IOUtils.rm(tmp);
}

public void testWriteToFile() throws IOException {
Expand Down