Skip to content

Clean up static web server in sql-client tests #49187

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 15, 2019
Merged

Clean up static web server in sql-client tests #49187

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
6 changes: 5 additions & 1 deletion ...n/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClientRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ public static void init() throws Exception {

@AfterClass
public static void cleanup() {
webServer.close();
try {
webServer.close();
} finally {
webServer = null;
}
}

public void testBinaryRequestEnabled() throws Exception {
Expand Down
8 changes: 6 additions & 2 deletions ...l/sql-client/src/test/java/org/elasticsearch/xpack/sql/client/HttpClientRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ public static void init() throws Exception {

@AfterClass
public static void cleanup() {
webServer.close();
try {
webServer.close();
} finally {
webServer = null;
}
}

public void testBinaryRequestForCLIEnabled() throws URISyntaxException {
Expand Down Expand Up @@ -145,7 +149,7 @@ private void assertBinaryRequestForDrivers(boolean isBinary, XContentType xConte
HttpClient httpClient = new HttpClient(conCfg);

Mode mode = randomFrom(Mode.JDBC, Mode.ODBC);
SqlQueryRequest request = new SqlQueryRequest(query,
SqlQueryRequest request = new SqlQueryRequest(query,
null,
ZoneId.of("Z"),
randomIntBetween(1, 100),
Expand Down