Skip to content

Commit 2311bdb

Browse files
committed
Bump Elastic.Xunit and make sure we emit output after node started, currently setting this to false leads to unexpected failures
1 parent 75a70a4 commit 2311bdb

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

src/Directory.build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<FileVersion>$(CurrentAssemblyFileVersion)</FileVersion>
1414

1515
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
16+
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
17+
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
1618

1719
<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
1820
<Authors>Elasticsearch BV</Authors>

src/Tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ public ClientTestClusterBase(ClientTestClusterConfiguration configuration) : bas
2727
public IElasticClient Client => this.GetOrAddClient(s=> this.ConnectionSettings(s.ApplyDomainSettings()));
2828

2929
protected virtual ConnectionSettings ConnectionSettings(ConnectionSettings s) => s;
30-
31-
// TODO don't think this override is needed anymore
32-
public override ICollection<Uri> NodesUris(string hostName = "localhost")
33-
{
34-
var host = (TestConnectionSettings.RunningFiddler) ? "ipv4.fiddler" : hostName;
35-
return base.NodesUris(host);
36-
}
3730
}
3831

3932
public class ClientTestClusterConfiguration : XunitClusterConfiguration
@@ -46,7 +39,7 @@ public ClientTestClusterConfiguration(ClusterFeatures features = ClusterFeatures
4639
: base(TestClient.Configuration.ElasticsearchVersion, features, new ElasticsearchPlugins(plugins), numberOfNodes)
4740
{
4841
this.TestConfiguration = TestClient.Configuration;
49-
this.ShowElasticsearchOutputAfterStarted = this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
42+
this.ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
5043

5144
this.CacheEsHomeInstallation = true;
5245
this.TrialMode = XPackTrialMode.Trial;

src/Tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeature
2525
this.XPackLicenseJson = licenseContents;
2626
}
2727
this.AdditionalBeforeNodeStartedTasks.Add(new EnsureWatcherActionConfigurationInElasticsearchYaml());
28+
this.ShowElasticsearchOutputAfterStarted = true; //this.TestConfiguration.ShowElasticsearchOutputAfterStarted;
2829
}
2930
}
3031

src/Tests/Tests.Core/Tests.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Tests.Domain\Tests.Domain.csproj" />
13-
<PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20180831T090241" />
13+
<PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20180902T153954" />
1414
<PackageReference Include="xunit" Version="2.3.1" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
1616
<PackageReference Include="FluentAssertions" Version="4.19.2" />

src/Tests/Tests.Domain/Tests.Domain.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Include="Bogus" Version="22.1.2" />
14-
<PackageReference Include="Elastic.Managed" Version="0.1.0-ci20180831T090241" />
14+
<PackageReference Include="Elastic.Managed" Version="0.1.0-ci20180902T153954" />
1515
<ProjectReference Include="..\Tests.Configuration\Tests.Configuration.csproj" />
1616
</ItemGroup>
1717
</Project>

src/Tests/Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net462</TargetFrameworks>
55
<VersionPrefix>6.0.0</VersionPrefix>
66
<VersionSuffix>alpha</VersionSuffix>
77
<NoWarn>$(NoWarn);xUnit1013</NoWarn>

0 commit comments

Comments
 (0)