From 8511d56a832953b4b568366e07de0aa99b0dd60d Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 9 Sep 2015 17:50:54 +0200 Subject: [PATCH] test: Remove version randomization from the parent child test. The <= 1.x impl has been removed, so no need to test it any more in master. Original commit: elastic/x-pack-elasticsearch@2633349d02b81c65de4e1e94aa958491efbc43e7 --- .../elasticsearch/integration/FieldLevelSecurityTests.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/shield/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java b/shield/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java index ed264ef614d..5063a1de1a3 100644 --- a/shield/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java +++ b/shield/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java @@ -715,14 +715,7 @@ public class FieldLevelSecurityTests extends ShieldIntegTestCase { } public void testParentChild() { - // There are two parent/child impls: - // pre 2.0 parent/child uses the _uid and _parent fields - // 2.0 and beyond parent/child uses dedicated doc values join fields - // Both impls need to be tested with field level security, so that is why the index version is randomized here. - Version version = randomFrom(Version.V_1_7_2, Version.CURRENT); - logger.info("Testing parent/child with field level security on an index created with version[{}]", version); assertAcked(prepareCreate("test") - .setSettings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, version)) .addMapping("parent") .addMapping("child", "_parent", "type=parent")); ensureGreen();