Skip to content

ESIntegTestCase always cleans up static fields #49105

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
Nov 14, 2019
Merged

ESIntegTestCase always cleans up static fields #49105

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
16 changes: 8 additions & 8 deletions test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1947,19 +1947,19 @@ public final void cleanUpCluster() throws Exception {

@AfterClass
public static void afterClass() throws Exception {
if (!runTestScopeLifecycle()) {
try {
try {
if (runTestScopeLifecycle()) {
clearClusters();
} else {
INSTANCE.printTestMessage("cleaning up after");
INSTANCE.afterInternal(true);
checkStaticState(true);
} finally {
INSTANCE = null;
}
} else {
clearClusters();
} finally {
SUITE_SEED = null;
currentCluster = null;
INSTANCE = null;
}
SUITE_SEED = null;
currentCluster = null;
}

private static void initializeSuiteScope() throws Exception {
Expand Down