From 5d5596382faee5d2daf0048e9c4a167bcfd7b2dd Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 May 2021 10:53:01 +0100 Subject: [PATCH 1/3] Removed flattened assert from xpack --- tests/Tests/XPack/Info/XPackInfoApiTests.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/Tests/XPack/Info/XPackInfoApiTests.cs b/tests/Tests/XPack/Info/XPackInfoApiTests.cs index 468fb925040..a8a65f867ad 100644 --- a/tests/Tests/XPack/Info/XPackInfoApiTests.cs +++ b/tests/Tests/XPack/Info/XPackInfoApiTests.cs @@ -66,9 +66,12 @@ [I] public async Task XPackInfoResponse() => await Assert(XPa r.Features.Watcher.Should().NotBeNull(); r.License.Should().NotBeNull(); + // Flattened fields were moved from x-pack to core in 7.13.0 (https://github.com/elastic/elasticsearch/pull/68780) + if (TestConfiguration.Instance.InRange(">=7.3.0") && TestConfiguration.Instance.InRange("<7.13.0")) + r.Features.Flattened.Should().NotBeNull(); + if (TestConfiguration.Instance.InRange(">=7.3.0")) { - r.Features.Flattened.Should().NotBeNull(); r.Features.Vectors.Should().NotBeNull(); if (TestConfiguration.Instance.InRange("<7.5.0")) @@ -110,9 +113,15 @@ [I] public async Task XPackUsageResponse() => await Assert(X r.Alerting.Execution.Should().NotBeNull(); r.Alerting.Watch.Should().NotBeNull(); + // Flattened fields were moved from x-pack to core in 7.13.0 (https://github.com/elastic/elasticsearch/pull/68780) + if (TestConfiguration.Instance.InRange(">=7.3.0") && TestConfiguration.Instance.InRange("<7.13.0")) + r.Flattened.Should().NotBeNull(); + + if (TestConfiguration.Instance.InRange(">=7.6.0") && TestConfiguration.Instance.InRange("<7.13.0")) + r.Flattened.FieldCount.Should().HaveValue(); + if (TestConfiguration.Instance.InRange(">=7.3.0")) { - r.Flattened.Should().NotBeNull(); r.Vectors.Should().NotBeNull(); r.VotingOnly.Should().NotBeNull(); @@ -120,9 +129,6 @@ [I] public async Task XPackUsageResponse() => await Assert(X #pragma warning disable 618 r.DataFrame.Should().NotBeNull(); #pragma warning restore 618 - - if (TestConfiguration.Instance.InRange(">=7.6.0")) - r.Flattened.FieldCount.Should().HaveValue(); } if (TestConfiguration.Instance.InRange(">=7.5.0")) From 05348f427ad6d05c14408158c73eeca3c80299fe Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 May 2021 11:24:00 +0100 Subject: [PATCH 2/3] Update test matrix --- .ci/test-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index 7da4a4fb9f6..2367053bebd 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -1,7 +1,7 @@ --- STACK_VERSION: - - 7.x-SNAPSHOT + - 7.13.0-SNAPSHOT TEST_SUITE: - free From 3b5c7f28950b83b8d7c852b1216910fdff3b8863 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 May 2021 11:46:43 +0100 Subject: [PATCH 3/3] Extend DebugMode test timeout to 10s --- tests/Tests/ClientConcepts/Troubleshooting/DebugMode.doc.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Tests/ClientConcepts/Troubleshooting/DebugMode.doc.cs b/tests/Tests/ClientConcepts/Troubleshooting/DebugMode.doc.cs index 4e79b64eec5..5ba4104c292 100644 --- a/tests/Tests/ClientConcepts/Troubleshooting/DebugMode.doc.cs +++ b/tests/Tests/ClientConcepts/Troubleshooting/DebugMode.doc.cs @@ -60,7 +60,7 @@ [I] public void EnableDebugMode() // hide settings.DefaultIndex(Client.ConnectionSettings.DefaultIndex); // hide - settings.PingTimeout(TimeSpan.FromSeconds(5)); // Avoids occasional CI failures + settings.PingTimeout(TimeSpan.FromSeconds(10)); // Avoids occasional CI failures var client = new ElasticClient(settings);