Skip to content

Commit 529eda3

Browse files
committed
Use more targeted muting of failing SQL spec tests
A previous commit muted these suites. This commit opts for a more targeted muting of some failing SQL spec tests.
1 parent b80e279 commit 529eda3

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcCsvSpecIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
*/
66
package org.elasticsearch.xpack.sql.qa.single_node;
77

8-
import org.apache.lucene.util.LuceneTestCase;
98
import org.elasticsearch.xpack.sql.qa.jdbc.CsvSpecTestCase;
109
import org.elasticsearch.xpack.sql.qa.jdbc.CsvTestUtils.CsvTestCase;
1110

12-
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40994")
1311
public class JdbcCsvSpecIT extends CsvSpecTestCase {
1412
public JdbcCsvSpecIT(String fileName, String groupName, String testName, Integer lineNumber, CsvTestCase testCase) {
1513
super(fileName, groupName, testName, lineNumber, testCase);

x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
package org.elasticsearch.xpack.sql.qa.single_node;
77

88
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
9-
109
import org.apache.logging.log4j.Logger;
11-
import org.apache.lucene.util.LuceneTestCase;
1210
import org.elasticsearch.client.RestClient;
1311
import org.elasticsearch.xpack.sql.qa.jdbc.CsvTestUtils.CsvTestCase;
1412
import org.elasticsearch.xpack.sql.qa.jdbc.DataLoader;
@@ -37,7 +35,6 @@
3735
* That's not to say the two cannot be merged however that felt like too much of an effort
3836
* at this stage and, to not keep things stalling, started with this approach.
3937
*/
40-
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40994")
4138
public class JdbcDocCsvSpecIT extends SpecBaseIntegrationTestCase {
4239

4340
private final CsvTestCase testCase;

x-pack/plugin/sql/qa/src/main/resources/date.csv-spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SELECT TRUNCATE(YEAR(TODAY() - INTERVAL 50 YEARS) / 1000) AS result;
3535
;
3636

3737

38-
currentDateFilter
38+
currentDateFilter-Ignore
3939
SELECT first_name FROM test_emp WHERE hire_date > CURRENT_DATE() - INTERVAL 25 YEARS ORDER BY first_name ASC LIMIT 10;
4040

4141
first_name

x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ SELECT TODAY() AS result;
24002400
// end::todayFunction
24012401
;
24022402

2403-
filterToday
2403+
filterToday-Ignore
24042404
// tag::filterToday
24052405
SELECT first_name FROM emp WHERE hire_date > TODAY() - INTERVAL 25 YEARS ORDER BY first_name ASC LIMIT 5;
24062406

0 commit comments

Comments
 (0)