From 9633b1d7bc51295c6506df7f4782150e610b87a2 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 10 Oct 2017 16:44:21 -0400 Subject: [PATCH] Remove an @AwaitsFix on test in SQL (elastic/x-pack-elasticsearch#2719) It has been fixed already, actually. Original commit: elastic/x-pack-elasticsearch@46c8dacc504db46c7ee29f4f61bad158301b7633 --- .../elasticsearch/xpack/qa/sql/security/JdbcCsvSpecIT.java | 7 ------- .../xpack/qa/sql/security/JdbcShowTablesIT.java | 3 --- 2 files changed, 10 deletions(-) diff --git a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcCsvSpecIT.java b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcCsvSpecIT.java index 55e4c4baa53..97d1da47354 100644 --- a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcCsvSpecIT.java +++ b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcCsvSpecIT.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.qa.sql.security; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.qa.sql.jdbc.CsvSpecTestCase; -import org.junit.Before; import java.util.Properties; @@ -25,10 +24,4 @@ public class JdbcCsvSpecIT extends CsvSpecTestCase { protected Properties connectionProperties() { return JdbcConnectionIT.securityProperties(); } - - @Before - public void skipShowTables() { - // NOCOMMIT filter out tables starting with . - assumeFalse("fails because we don't skip tables starting with .", testName.equals("ShowTables")); - } } diff --git a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcShowTablesIT.java b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcShowTablesIT.java index b8491bf1939..2549e7e43ea 100644 --- a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcShowTablesIT.java +++ b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcShowTablesIT.java @@ -5,15 +5,12 @@ */ package org.elasticsearch.xpack.qa.sql.security; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xpack.qa.sql.jdbc.ShowTablesTestCase; import java.util.Properties; -@AwaitsFix(bugUrl="https://github.com/elastic/x-pack-elasticsearch/issues/2074") public class JdbcShowTablesIT extends ShowTablesTestCase { - // NOCOMMIT filter out tables starting with . @Override protected Settings restClientSettings() { return RestSqlIT.securitySettings();