Skip to content

Commit 19999cd

Browse files
committed
Use the cluster node port in exception integration tests
1 parent 5906d17 commit 19999cd

File tree

8 files changed

+13
-10
lines changed

8 files changed

+13
-10
lines changed

build/scripts/Releasing.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ type Release() =
122122
let frameworkDirs = (sprintf "%s/lib" unzippedDir |> directoryInfo).GetDirectories()
123123
for frameworkDir in frameworkDirs do
124124
let frameworkPdbDir = sprintf "%s/%s" srcFolder frameworkDir.Name
125-
gitLink frameworkPdbDir
125+
gitLink frameworkPdbDir projectName
126126
let pdb = sprintf "%s.pdb" projectName
127127
let frameworkPdbFile = sprintf "%s/%s" frameworkPdbDir pdb
128128
if fileExists frameworkPdbFile

src/Benchmarking/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7811,7 +7811,7 @@
78117811
"runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
78127812
"type": "package",
78137813
"serviceable": true,
7814-
"sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
7814+
"sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
78157815
"files": [
78167816
"ref/dotnet/_._",
78177817
"runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Elasticsearch.Net/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@
17391739
"runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
17401740
"type": "package",
17411741
"serviceable": true,
1742-
"sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
1742+
"sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
17431743
"files": [
17441744
"ref/dotnet/_._",
17451745
"runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
namespace Nest
55
{
66
[JsonObject(MemberSerialization.OptIn)]
7-
//[JsonConverter(typeof(GetRepositoryResponseConverter))]
87
public interface IVerifyRepositoryResponse : IResponse
98
{
109
/// <summary>

src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
namespace Nest
77
{
88
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
9-
//[JsonConverter(typeof(DismaxQueryJsonConverter))]
109
[JsonConverter(typeof(ReadAsTypeJsonConverter<DisMaxQuery>))]
1110
public interface IDisMaxQuery : IQuery
1211
{

src/Nest/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@
20592059
"runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
20602060
"type": "package",
20612061
"serviceable": true,
2062-
"sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
2062+
"sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
20632063
"files": [
20642064
"ref/dotnet/_._",
20652065
"runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Tests/ClientConcepts/Exceptions/ExceptionTests.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@ namespace Tests.ClientConcepts.Exceptions
1212
[Collection(IntegrationContext.Indexing)]
1313
public class ExceptionTests
1414
{
15-
public ExceptionTests(IndexingCluster cluster, EndpointUsage usage) { }
15+
private int _port;
16+
17+
public ExceptionTests(IndexingCluster cluster, EndpointUsage usage)
18+
{
19+
_port = cluster.Node.Port;
20+
}
1621

1722
[I]
1823
public void ServerTestWhenThrowExceptionsEnabled()
1924
{
20-
var settings = new ConnectionSettings(new Uri($"http://{TestClient.Host}:9200"))
25+
var settings = new ConnectionSettings(new Uri($"http://{TestClient.Host}:{_port}"))
2126
.ThrowExceptions();
2227
var client = new ElasticClient(settings);
2328
var exception = Assert.Throws<ElasticsearchClientException>(() => client.GetMapping<Project>(s => s.Index("doesntexist")));
@@ -46,7 +51,7 @@ public void ClientTestWhenThrowExceptionsEnabled()
4651
[I]
4752
public void ServerTestWhenThrowExceptionsDisabled()
4853
{
49-
var settings = new ConnectionSettings(new Uri($"http://{TestClient.Host}:9200"));
54+
var settings = new ConnectionSettings(new Uri($"http://{TestClient.Host}:{_port}"));
5055
var client = new ElasticClient(settings);
5156
var response = client.GetMapping<Project>(s => s.Index("doesntexist"));
5257
#if DOTNETCORE

src/Tests/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6406,7 +6406,7 @@
64066406
"runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
64076407
"type": "package",
64086408
"serviceable": true,
6409-
"sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
6409+
"sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
64106410
"files": [
64116411
"ref/dotnet/_._",
64126412
"runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

0 commit comments

Comments
 (0)