Skip to content

Ensure Test Cluster in Azure Discovery Tests Closes #43057

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 7 commits into from
Jun 12, 2019
Merged

Ensure Test Cluster in Azure Discovery Tests Closes #43057

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2d7149
Ensure Test Cluster in Azure Discovery Tests Closes
original-brownbear Jun 10, 2019
ef9c118
unmute ...
original-brownbear Jun 10, 2019
ff2b66c
Merge remote-tracking branch 'elastic/master' into 43048
original-brownbear Jun 11, 2019
30bd54c
Merge remote-tracking branch 'elastic/master' into 43048
original-brownbear Jun 11, 2019
2570d16
Merge remote-tracking branch 'elastic/master' into 43048
original-brownbear Jun 11, 2019
590bf4b
Merge remote-tracking branch 'elastic/master' into 43048
original-brownbear Jun 11, 2019
f07dcaa
revert timeout increase
original-brownbear Jun 11, 2019
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
13 changes: 6 additions & 7 deletions ...t/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsServer;
import org.apache.logging.log4j.LogManager;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.bootstrap.JavaVersion;
import org.elasticsearch.cloud.azure.classic.management.AzureComputeService;
import org.elasticsearch.common.SuppressForbidden;
Expand Down Expand Up @@ -71,7 +70,6 @@
import java.util.UUID;
import java.util.concurrent.ExecutionException;

@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/43048")
@ESIntegTestCase.ClusterScope(numDataNodes = 2, numClientNodes = 0)
@SuppressForbidden(reason = "use http server")
// TODO this should be a IT but currently all ITs in this project run against a real cluster
Expand Down Expand Up @@ -292,13 +290,14 @@ private static String getProtocol() {

@AfterClass
public static void stopHttpd() throws IOException {
for (int i = 0; i < internalCluster().size(); i++) {
try {
// shut them all down otherwise we get spammed with connection refused exceptions
internalCluster().stopRandomDataNode();
internalCluster().close();
} finally {
httpsServer.stop(0);
httpsServer = null;
logDir = null;
}
httpsServer.stop(0);
httpsServer = null;
logDir = null;
}

public void testJoin() throws ExecutionException, InterruptedException {
Expand Down