From 36b460060c99ccc553d7559c73b296fbf578a356 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 24 Jan 2020 14:37:26 +0100 Subject: [PATCH] Unmuted watcher security smoke tests on 7 dot x branch. Also removed the usage of types in watcher's index action and added more logging in case this test fails again. Relates to #30777 --- .../smoketest/SmokeTestWatcherWithSecurityIT.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java index 9cfdc5cece2de..2094aa82fef21 100644 --- a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java +++ b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java @@ -6,7 +6,6 @@ package org.elasticsearch.smoketest; import org.apache.http.util.EntityUtils; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.common.Strings; @@ -33,7 +32,6 @@ import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.is; -@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/35361") public class SmokeTestWatcherWithSecurityIT extends ESRestTestCase { private static final String TEST_ADMIN_USERNAME = "test_admin"; @@ -200,7 +198,6 @@ public void testSearchTransformHasPermissions() throws Exception { .endObject().endObject().endObject(); builder.startObject("actions").startObject("index").startObject("index") .field("index", "my_test_index") - .field("doc_type", "doc") .field("doc_id", "my-id") .endObject().endObject().endObject(); builder.endObject(); @@ -231,7 +228,6 @@ public void testSearchTransformInsufficientPermissions() throws Exception { .endObject().endObject().endObject(); builder.startObject("actions").startObject("index").startObject("index") .field("index", "my_test_index") - .field("doc_type", "doc") .field("doc_id", "some-id") .endObject().endObject().endObject(); builder.endObject(); @@ -252,7 +248,6 @@ public void testIndexActionHasPermissions() throws Exception { builder.startObject("input").startObject("simple").field("spam", "eggs").endObject().endObject(); builder.startObject("actions").startObject("index").startObject("index") .field("index", "my_test_index") - .field("doc_type", "doc") .field("doc_id", "my-id") .endObject().endObject().endObject(); builder.endObject(); @@ -276,7 +271,6 @@ public void testIndexActionInsufficientPrivileges() throws Exception { builder.startObject("input").startObject("simple").field("spam", "eggs").endObject().endObject(); builder.startObject("actions").startObject("index").startObject("index") .field("index", "index_not_allowed_to_read") - .field("doc_type", "doc") .field("doc_id", "my-id") .endObject().endObject().endObject(); builder.endObject();