honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test on incompatible client versions (#56234) (#56241) 

The incomatible client version test is changed to:
- iterate on all versions prior to the allowed one_s;
- format the exception message just as the server does it.

The defect stemed from the fact that the clients will not send a
version's qualifier, but just major.minor.revision, so the raised
error/exception_message won't contain it, while the test expected it.

(cherry picked from commit 4a81c8f7a1f4573e3be95f346d9fb18772b297ee)
This commit is contained in:
Bogdan Pintea 2020-05-05 23:18:29 +02:00 committed by GitHub
parent 63062ec7bd
commit f159fd8a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/VersionParityTests.java
View File

@ -13,6 +13,7 @@ import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.VersionUtils;
import org.elasticsearch.test.http.MockResponse; import org.elasticsearch.test.http.MockResponse;
import org.elasticsearch.xpack.sql.client.ClientVersion; import org.elasticsearch.xpack.sql.client.ClientVersion;
import org.elasticsearch.xpack.sql.proto.SqlVersion;
import java.io.IOException; import java.io.IOException;
import java.sql.SQLException; import java.sql.SQLException;
@ -26,15 +27,22 @@ import java.sql.SQLException;
public class VersionParityTests extends WebServerTestCase { public class VersionParityTests extends WebServerTestCase {
public void testExceptionThrownOnIncompatibleVersions() throws IOException, SQLException { public void testExceptionThrownOnIncompatibleVersions() throws IOException, SQLException {
Version version = VersionUtils.randomVersionBetween(random(), null, VersionUtils.getPreviousVersion(Version.V_7_7_0));
logger.info("Checking exception is thrown for version {}", version);
prepareResponse(version);
String url = JdbcConfiguration.URL_PREFIX + webServerAddress(); String url = JdbcConfiguration.URL_PREFIX + webServerAddress();
SQLException ex = expectThrows(SQLException.class, () -> new JdbcHttpClient(JdbcConfiguration.create(url, null, 0))); Version firstVersion = VersionUtils.getFirstVersion();
assertEquals("This version of the JDBC driver is only compatible with Elasticsearch version " + Version version = Version.V_7_7_0;
ClientVersion.CURRENT.majorMinorToString() + " or newer; attempting to connect to a server " + do {
"version " + version.toString(), ex.getMessage()); version = VersionUtils.getPreviousVersion(version);
logger.info("Checking exception is thrown for version {}", version);
prepareResponse(version);
// Client's version is wired up to patch level, excluding the qualifier => generate the test version as the server does it.
String versionString = SqlVersion.fromString(version.toString()).toString();
SQLException ex = expectThrows(SQLException.class, () -> new JdbcHttpClient(JdbcConfiguration.create(url, null, 0)));
assertEquals("This version of the JDBC driver is only compatible with Elasticsearch version " +
ClientVersion.CURRENT.majorMinorToString() + " or newer; attempting to connect to a server " +
"version " + versionString, ex.getMessage());
} while (version.compareTo(firstVersion) > 0);
} }
public void testNoExceptionThrownForCompatibleVersions() throws IOException { public void testNoExceptionThrownForCompatibleVersions() throws IOException {