Skip to content

Commit 63ca902

Browse files
committed
Use Elasticsearch 2.0 ReindexOnServerResponse json structure
Backported unit test was failing because it uses the 5.0 json structure. Updated to use a 2.4.1 response Remove duplicate referenced tests Update tests.yaml to Elasticsearch 2.4.1
1 parent 1a5312e commit 63ca902

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

src/Tests/Reproduce/GithubIssue2309.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,12 @@ public void FailedReIndexResponseMarkedAsInvalidAndContainFailures()
2929
""total"": 1,
3030
""updated"": 0,
3131
""created"": 0,
32-
""deleted"": 0,
3332
""batches"": 1,
3433
""version_conflicts"": 0,
3534
""noops"": 0,
36-
""retries"": {
37-
""bulk"": 0,
38-
""search"": 0
39-
},
35+
""retries"": 0,
4036
""throttled_millis"": 0,
41-
""requests_per_second"": -1.0,
42-
""throttled_until_millis"": 0,
37+
""requests_per_second"": ""unlimited"",
4338
""failures"": [{
4439
""index"": ""employees-v2"",
4540
""type"": ""employee"",

src/Tests/Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,6 @@
571571
<Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryApiTests.cs" />
572572
<Compile Include="Document\Multiple\UpdateByQuery\UpdateByQueryUrlTests.cs" />
573573
<Compile Include="Reproduce\GithubIssue2309.cs" />
574-
<Compile Include="Search\MultiSearch\MultiSearchApiTests.cs" />
575-
<Compile Include="Search\MultiSearch\MultiSearchInvalidApiTests.cs" />
576574
<Compile Include="Framework\Extensions\UriExtensions.cs" />
577575
<Compile Include="Framework\Integration\CallUniqueValues.cs" />
578576
<Compile Include="Framework\Integration\ClientMethod.cs" />

src/Tests/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# mode either u (unit test), i (integration test) or m (mixed mode)
2-
mode: u
2+
mode: m
33
# the elasticsearch version that should be started
4-
elasticsearch_version: 2.4.0
4+
elasticsearch_version: 2.4.1
55
# whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
66
force_reseed: true
77
# do not spawn nodes as part of the test setup but rely on a manually started es node being up

0 commit comments

Comments
 (0)