Skip to content

Commit 5cf52bf

Browse files
committed
Fixed integration failures on 2.0 due to new API's
1 parent dced212 commit 5cf52bf

File tree

10 files changed

+14
-5
lines changed

10 files changed

+14
-5
lines changed

build/scripts/Paths.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ module Tooling =
294294
execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
295295
| (Both, Some d, Some c) ->
296296
let proc = d.Process exe
297-
let result = execProcess proc arguments
297+
let result = execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
298298
if result <> 0 then failwith (sprintf "Failed to run dnx tooling for %s args: %A" proc arguments)
299299
let proc = c.Process exe
300300
execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)

src/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Tests.Aggregations.Metric.ExtendedStats
1010
{
11-
[SkipVersion("<2.2.0", "")]
1211
public class ExtendedStatsAggregationUsageTests : AggregationUsageTestBase
1312
{
1413
public ExtendedStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }

src/Tests/Aggregations/Pipeline/ExtendedStatsBucket/ExtendedStatsBucketAggregationUsageTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System;
22
using FluentAssertions;
33
using Nest;
4+
using Tests.Framework;
45
using Tests.Framework.Integration;
56
using Tests.Framework.MockData;
67

78
namespace Tests.Aggregations.Pipeline.ExtendedStatsBucket
89
{
10+
[SkipVersion("<2.1.0", "")]
911
public class ExtendedStatsBucketAggregationUsageTests : AggregationUsageTestBase
1012
{
1113
public ExtendedStatsBucketAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

src/Tests/Aggregations/Pipeline/StatsBucket/StatsBucketAggregationUsageTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System;
22
using FluentAssertions;
33
using Nest;
4+
using Tests.Framework;
45
using Tests.Framework.Integration;
56
using Tests.Framework.MockData;
67

78
namespace Tests.Aggregations.Pipeline.StatsBucket
89
{
10+
[SkipVersion("<2.1.0", "")]
911
public class StatsBucketAggregationUsageTests : AggregationUsageTestBase
1012
{
1113
public StatsBucketAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

src/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Tests.Cat.CatRepositories
1212
{
1313
[Collection(IntegrationContext.Indexing)]
14+
[SkipVersion("<2.1.0", "")]
1415
public class CatRepositoriesApiTests : ApiIntegrationTestBase<ICatResponse<CatRepositoriesRecord>, ICatRepositoriesRequest, CatRepositoriesDescriptor, CatRepositoriesRequest>
1516
{
1617
private static readonly string RepositoryName = RandomString();

src/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Tests.Cat.CatSnapshots
1212
{
1313
[Collection(IntegrationContext.Indexing)]
14+
[SkipVersion("<2.1.0", "")]
1415
public class CatSnapshotsApiTests : ApiIntegrationTestBase<ICatResponse<CatSnapshotsRecord>, ICatSnapshotsRequest, CatSnapshotsDescriptor, CatSnapshotsRequest>
1516
{
1617
private static readonly string SnapshotName = RandomString();

src/Tests/Cluster/TaskManagement/TasksList/TasksListApiTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace Tests.Cluster.TaskManagement.TasksList
1111
{
1212
[Collection(IntegrationContext.ReadOnly)]
13+
[SkipVersion("<2.3.0", "")]
1314
public class TasksListApiTests : ApiIntegrationTestBase<ITasksListResponse, ITasksListRequest, TasksListDescriptor, TasksListRequest>
1415
{
1516
public TasksListApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

src/Tests/Framework/Integration/Process/ElasticsearchNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ElasticsearchNode : IDisposable
2525
{
2626
{ "delete-by-query", _ => "delete-by-query" },
2727
{ "cloud-azure", _ => "cloud-azure" },
28-
{ "mapper-attachments", MapperAttachmentPlugin.GetVersion },
28+
{ "elasticsearch-mapper-attachments ", MapperAttachmentPlugin.GetVersion },
2929
{ "mapper-murmur3", _ => "mapper-murmur3" },
3030
{ "license", _ => "license" },
3131
{ "graph", _ => "graph" },

src/Tests/Framework/TestAttributes.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#if DOTNETCORE
1313
namespace SemVer
1414
{
15-
//TODO incredibly ugly but on .net core we only support exact matches
15+
//TODO incredibly ugly but on .net core we always skip tests marked with SkipVersion
1616
//We'll need to submit a PR to https://github.com/adamreeve/semver.net once .net core is
1717
//in more stable waters
1818

@@ -23,7 +23,9 @@ public Range(string range)
2323
{
2424
this._range = range;
2525
}
26-
public bool IsSatisfied(SemVer.Version version) => version?.Parsed == this._range;
26+
//if a test has a skip range skip alwyas on CoreCLR since we can not as of yet
27+
//validate ranges
28+
public bool IsSatisfied(SemVer.Version version) => this._range != null;
2729
}
2830
public class Version
2931
{

src/Tests/Reproduce/GithubIssue1863.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
namespace Tests.Reproduce
1414
{
1515
[Collection(IntegrationContext.ReadOnly)]
16+
[SkipVersion("<2.1.0", "")]
1617
public class GithubIssue1863
1718
{
1819
[I]

0 commit comments

Comments
 (0)