QA: Create xpack yaml features #31403

nik9000 · 2018-06-18T17:40:20Z

This creates a YAML test "features" that indices if the cluster being
tested has xpack installed (xpack) or if it does not have xpack
installed (no_xpack). It uses those features to centralize skipping
a few tests that fail if xpack is installed.

The plan is to use this in a followup to skip docs tests that require
xpack when xpack is not installed. We plan to use the declaration
of required license level on the docs page to generate the required
skip.

Closes #30933.

elasticmachine · 2018-06-18T17:40:21Z

Pinging @elastic/es-core-infra

nik9000 · 2018-06-18T17:41:15Z

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

+    /**
+     * Does the cluster being tested have xpack installed?
+     */
+    public static boolean hasXPack() throws IOException {


I made this static so that we could use it easily from feature. I feel like if client() is static then this can be.

nik9000 · 2018-06-18T17:41:57Z

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -91,13 +94,38 @@
    /**
     * Convert the entity from a {@link Response} into a map of maps.
     */
-    public Map<String, Object> entityAsMap(Response response) throws IOException {
+    public static Map<String, Object> entityAsMap(Response response) throws IOException {


I made this static so I could make hasXPack static. There was no need for it to use the fancy registries provided by createParser.

nik9000 · 2018-06-18T17:42:50Z

...n/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java

@@ -41,7 +39,7 @@ private void deleteAllDatafeeds() throws IOException {
        final Response datafeedsResponse = adminClient.performRequest(datafeedsRequest);
        @SuppressWarnings("unchecked")
        final List<Map<String, Object>> datafeeds =
-                (List<Map<String, Object>>) XContentMapValues.extractValue("datafeeds", testCase.entityAsMap(datafeedsResponse));
+                (List<Map<String, Object>>) XContentMapValues.extractValue("datafeeds", ESRestTestCase.entityAsMap(datafeedsResponse));


Checkstyle forced me to change this and the rest of the changes to this file come about because of the change here.

nik9000 · 2018-06-18T17:43:05Z

...lugin/core/src/test/java/org/elasticsearch/xpack/core/rollup/RollupRestTestStateCleaner.java

@@ -75,7 +73,7 @@ private void waitForPendingTasks() throws Exception {
    @SuppressWarnings("unchecked")
    private void deleteAllJobs() throws Exception {
        Response response = adminClient.performRequest("GET", "/_xpack/rollup/job/_all");
-        Map<String, Object> jobs = testCase.entityAsMap(response);
+        Map<String, Object> jobs = ESRestTestCase.entityAsMap(response);


Checkstyle forced me to change this and the rest of the changes to this file come about because of the change here.

hub-cap

LGTM, nits.

hub-cap · 2018-06-25T14:19:09Z

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

+            throw new IllegalStateException("must be called inside of a rest test case test");
+        }
+        Map<?, ?> response = entityAsMap(client.performRequest(new Request("GET", "_nodes/plugins")));
+        Map<?, ?> nodes = (Map<?, ?>) response.get("nodes");


Do we need to do any null checks here? Im a-ok not doing it given we always know it will come back w/ the data we want/need. I know its just a call to _nodes/plugins so I assume this is legit.

I figure we change the format of _nodes/plugins rarely enough that we're probably safe without them. If we change the format a NullPointException is the least of our problems, I think.

hub-cap · 2018-06-25T14:22:11Z

test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java

+                    if (ESRestTestCase.hasXPack()) {
+                        return false;
+                    }
+                } else if (false == SUPPORTED.contains(feature)) {


any reason we just dont return SUPPORTED.contains(feature) for the last if branch?

We need to keep looping to check for the next feature.

This creates a YAML test "features" that indices if the cluster being tested has xpack installed (`xpack`) or if it does *not* have xpack installed (`no_xpack`). It uses those features to centralize skipping a few tests that fail if xpack is installed. The plan is to use this in a followup to skip docs tests that require xpack when xpack is not installed. We *plan* to use the declaration of required license level on the docs page to generate the required `skip`. Closes #30933.

nik9000 · 2018-06-26T20:46:23Z

Backported to 6.x. I do not plan to backport to 6.3.

* master: ingest: Add ignore_missing property to foreach filter (#22147) (#31578) Fix a formatting issue in the docvalue_fields documentation. (#31563) reduce log level at gradle configuration time [TEST] Close additional clients created while running yaml tests (#31575) Docs: Clarify sensitive fields watcher encryption (#31551) Watcher: Remove never executed code (#31135) Add support for switching distribution for all integration tests (#30874) Improve robustness of geo shape parser for malformed shapes (#31449) QA: Create xpack yaml features (#31403) Improve test times for tests using `RandomObjects::addFields` (#31556) [Test] Add full cluster restart test for Rollup (#31533) Enhance thread context uniqueness assertion [DOCS] Fix heading format errors (#31483) fix writeIndex evaluation for aliases (#31562) Add x-opaque-id to search slow logs (#31539) Watcher: Fix put watch action (#31524) Add package pre-install check for java binary (#31343) Reduce number of raw types warnings (#31523) Migrate scripted metric aggregation scripts to ScriptContext design (#30111) turn GetFieldMappingsResponse to ToXContentObject (#31544) Close xcontent parsers (partial) (#31513) Ingest Attachment: Upgrade Tika to 1.18 (#31252) TEST: Correct the assertion arguments order (#31540)

* elastic/master: (57 commits) HLRest: Fix test for explain API [TEST] Fix RemoteClusterConnectionTests Add Create Snapshot to High-Level Rest Client (elastic#31215) Remove legacy MetaDataStateFormat (elastic#31603) Add explain API to high-level REST client (elastic#31387) Preserve thread context when connecting to remote cluster (elastic#31574) Unify headers for full text queries Remove redundant 'minimum_should_match' JDBC driver prepared statement set* methods (elastic#31494) [TEST] call yaml client close method from test suite (elastic#31591) ingest: Add ignore_missing property to foreach filter (elastic#22147) (elastic#31578) Fix a formatting issue in the docvalue_fields documentation. (elastic#31563) reduce log level at gradle configuration time [TEST] Close additional clients created while running yaml tests (elastic#31575) Docs: Clarify sensitive fields watcher encryption (elastic#31551) Watcher: Remove never executed code (elastic#31135) Add support for switching distribution for all integration tests (elastic#30874) Improve robustness of geo shape parser for malformed shapes (elastic#31449) QA: Create xpack yaml features (elastic#31403) Improve test times for tests using `RandomObjects::addFields` (elastic#31556) ...

* 6.x: Docs: Remove duplicate test setup Docs: Fix description of percentile ranks example example (#31652) Remove deprecation warnings to prepare for Gradle 5 (sourceSets.main.output.classesDirs) (#30389) Do not check for Azure container existence (#31617) Merge AwsS3Service and InternalAwsS3Service in a S3Service class (#31580) Remove item listed in 6.3 notes that's not in 6.3 (#31623) remove unused import Upgrade gradle wrapper to 4.8 (#31525) Only set vm.max_map_count if greater than default (#31512) QA: Merge query-builder-bwc to restart test (#30979) Docs: Skip xpack snippet tests if no xpack (#31619) [TEST] Fix RemoteClusterConnectionTests Remove legacy MetaDataStateFormat (#31603) [TEST] call yaml client close method from test suite (#31591) [TEST] Close additional clients created while running yaml tests (#31575) Node selector per client rather than per request (#31471) Preserve thread context when connecting to remote cluster (#31574) Remove redundant 'minimum_should_match' Unify headers for full text queries JDBC driver prepared statement set* methods (#31494) add logging breaking changes from 5.3 to 6.0 (#31583) Fix a formatting issue in the docvalue_fields documentation. (#31563) Improve robustness of geo shape parser for malformed shapes QA: Create xpack yaml features (#31403)

nik9000 added 3 commits June 13, 2018 14:24

QA: Create xpack yaml feature

12b9034

WIP

30b3e7e

Merge branch 'master' into feature_xpack

b0f7e04

nik9000 added review :Delivery/Build Build or test infrastructure v7.0.0 v6.4.0 labels Jun 18, 2018

Fix import order

3a7c532

nik9000 commented Jun 18, 2018

View reviewed changes

lcawl mentioned this pull request Jun 18, 2018

Merge x-pack/docs into docs #30665

Closed

5 tasks

nik9000 requested a review from hub-cap June 22, 2018 20:31

hub-cap approved these changes Jun 25, 2018

View reviewed changes

nik9000 merged commit 232c71b into elastic:master Jun 26, 2018

nik9000 added the backport pending label Jun 26, 2018

nik9000 removed the backport pending label Jun 26, 2018

colings86 added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019

mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

QA: Create xpack yaml features #31403

QA: Create xpack yaml features #31403

nik9000 commented Jun 18, 2018 •

edited

Loading

elasticmachine commented Jun 18, 2018

nik9000 Jun 18, 2018

nik9000 Jun 18, 2018

nik9000 Jun 18, 2018

nik9000 Jun 18, 2018

hub-cap left a comment

hub-cap Jun 25, 2018

nik9000 Jun 26, 2018

hub-cap Jun 25, 2018

nik9000 Jun 26, 2018

nik9000 commented Jun 26, 2018

QA: Create xpack yaml features #31403

QA: Create xpack yaml features #31403

Conversation

nik9000 commented Jun 18, 2018 • edited Loading

elasticmachine commented Jun 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hub-cap left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nik9000 commented Jun 26, 2018

nik9000 commented Jun 18, 2018 •

edited

Loading