diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml index 36a091dc183..6aa24bf6103 100755 --- a/.ci/test-matrix.yml +++ b/.ci/test-matrix.yml @@ -1,7 +1,7 @@ --- STACK_VERSION: - - 7.x-SNAPSHOT + - 7.11-SNAPSHOT TEST_SUITE: - free diff --git a/readme.md b/readme.md index a10d1a06f51..9763a4a5c1b 100644 --- a/readme.md +++ b/readme.md @@ -402,3 +402,4 @@ A small HTTP server will be spun up locally on port 8000 through which you can v This software is Copyright (c) 2014-2019 by Elasticsearch BV. This is free software, licensed under: [The Apache License Version 2.0](https://github.com/elastic/elasticsearch-net/blob/master/license.txt). + diff --git a/src/Nest/Cluster/NodesInfo/NodeRole.cs b/src/Nest/Cluster/NodesInfo/NodeRole.cs index ef7efe73c71..a5f869be9c4 100644 --- a/src/Nest/Cluster/NodesInfo/NodeRole.cs +++ b/src/Nest/Cluster/NodesInfo/NodeRole.cs @@ -20,6 +20,9 @@ public enum NodeRole [EnumMember(Value = "data_cold")] DataCold, + [EnumMember(Value = "data_frozen")] + DataFrozen, + [EnumMember(Value = "data_content")] DataContent, diff --git a/tests/Tests/Search/Search/SearchApiTests.cs b/tests/Tests/Search/Search/SearchApiTests.cs index 36060a22583..ff871f0185e 100644 --- a/tests/Tests/Search/Search/SearchApiTests.cs +++ b/tests/Tests/Search/Search/SearchApiTests.cs @@ -722,11 +722,22 @@ public SearchApiRuntimeFieldsTests(ReadOnlyCluster cluster, EndpointUsage usage) protected override void ExpectResponse(ISearchResponse response) { response.Hits.Count.Should().BeGreaterThan(0); - response.Hits.First().Should().NotBeNull(); - response.Hits.First().Type.Should().NotBeNullOrWhiteSpace(); - response.Hits.First().Fields.ValueOf(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty(); - response.Hits.First().Fields.ValueOf(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty(); - response.Hits.First().Fields[RuntimeFieldName].As().FirstOrDefault().Should().NotBeNullOrEmpty(); + + foreach (var hit in response.Hits) + { + hit.Should().NotBeNull(); + + if (hit.Source.StartedOn != default) + { + hit.Fields.ValueOf(p => p.StartedOnDayOfWeek).Should().NotBeNullOrEmpty(); + hit.Fields.ValueOf(p => p.ThirtyDaysFromStarted).Should().NotBeNullOrEmpty(); + } + + if (!string.IsNullOrEmpty(hit.Source.Type)) + { + hit.Fields[RuntimeFieldName].As().FirstOrDefault().Should().NotBeNullOrEmpty(); + } + } } } }