File tree Expand file tree Collapse file tree 3 files changed +9
-22
lines changed
Aggregations/Bucket/Sampler
ClientConcepts/Certificates
Framework/ManagedElasticsearch/Clusters Expand file tree Collapse file tree 3 files changed +9
-22
lines changed Original file line number Diff line number Diff line change @@ -69,8 +69,9 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
69
69
sample . Should ( ) . NotBeNull ( ) ;
70
70
var sigTags = sample . SignificantTerms ( "significant_names" ) ;
71
71
sigTags . Should ( ) . NotBeNull ( ) ;
72
- sigTags . BgCount . Should ( ) . BeGreaterThan ( 0 ) ;
73
72
sigTags . DocCount . Should ( ) . BeGreaterThan ( 0 ) ;
73
+ if ( TestClient . VersionUnderTestSatisfiedBy ( ">=5.5.0" ) )
74
+ sigTags . BgCount . Should ( ) . BeGreaterThan ( 0 ) ;
74
75
}
75
76
}
76
77
}
Original file line number Diff line number Diff line change @@ -31,22 +31,6 @@ public abstract class SslAndKpiXPackCluster : XPackCluster
31
31
"xpack.security.http.ssl.enabled=true" ,
32
32
} ;
33
33
34
- // private static readonly object _lock = new object();
35
- // private static int _port = 9200;
36
- // private int? _desiredPort;
37
- // public override int DesiredPort
38
- // {
39
- // get
40
- // {
41
- // lock (_lock)
42
- // {
43
- // if (!this._desiredPort.HasValue)
44
- // this._desiredPort = ++_port;
45
- // return this._desiredPort.Value;
46
- // }
47
- // }
48
- // }
49
-
50
34
public override ConnectionSettings ClusterConnectionSettings ( ConnectionSettings s ) =>
51
35
this . ConnectionSettings ( Authenticate ( s ) ) ;
52
36
Original file line number Diff line number Diff line change 1
- using System . Linq ;
1
+ using System ;
2
+ using System . Linq ;
2
3
using Nest ;
3
4
using Tests . Framework . Integration ;
4
5
using Tests . Framework . ManagedElasticsearch . Plugins ;
@@ -8,10 +9,11 @@ namespace Tests.Framework.ManagedElasticsearch.Clusters
8
9
[ RequiresPlugin ( ElasticsearchPlugin . XPack ) ]
9
10
public class XPackCluster : ClusterBase
10
11
{
11
- protected override string [ ] AdditionalServerSettings => base . AdditionalServerSettings . Concat ( new [ ]
12
- {
13
- "xpack.security.authc.token.enabled=true"
14
- } ) . ToArray ( ) ;
12
+ protected string [ ] XPackSettings => TestClient . VersionUnderTestSatisfiedBy ( ">=5.5.0" )
13
+ ? new [ ] { "xpack.security.authc.token.enabled=true" }
14
+ : Array . Empty < string > ( ) ;
15
+
16
+ protected override string [ ] AdditionalServerSettings => base . AdditionalServerSettings . Concat ( this . XPackSettings ) . ToArray ( ) ;
15
17
16
18
public override ConnectionSettings ClusterConnectionSettings ( ConnectionSettings s ) =>
17
19
s . BasicAuthentication ( "es_admin" , "es_admin" ) ;
You can’t perform that action at this time.
0 commit comments