From 69a326dd9406944b893cee31e1350ba8226c8373 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Thu, 12 Oct 2017 12:40:58 -0400 Subject: [PATCH] Fix CliErrorsIT in sql security tests It was disabled because the CLI didn't work with security but we've since fixed that so we can enable it. Original commit: elastic/x-pack-elasticsearch@8d9b5ad89bd468374417478c0a379e129539ac81 --- .../elasticsearch/xpack/qa/sql/security/CliErrorsIT.java | 8 +++++--- .../xpack/qa/sql/security/CliFetchSizeIT.java | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliErrorsIT.java b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliErrorsIT.java index ee8debc845e..6bd5b628d23 100644 --- a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliErrorsIT.java +++ b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliErrorsIT.java @@ -5,15 +5,17 @@ */ 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.cli.ErrorsTestCase; -@AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/2074") public class CliErrorsIT extends ErrorsTestCase { - // NOCOMMIT get this working with security.... @Override protected Settings restClientSettings() { return RestSqlIT.securitySettings(); } + + @Override + protected String esUrlPrefix() { + return CliFetchSizeIT.securityEsUrlPrefix(); + } } diff --git a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliFetchSizeIT.java b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliFetchSizeIT.java index 1ce2651abed..cdb6e5e4b00 100644 --- a/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliFetchSizeIT.java +++ b/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/CliFetchSizeIT.java @@ -12,6 +12,7 @@ public class CliFetchSizeIT extends FetchSizeTestCase { static String securityEsUrlPrefix() { return "test_admin:x-pack-test-password@"; } + @Override protected Settings restClientSettings() { return RestSqlIT.securitySettings();