Fix failing unit and integration tests

Requesting a client on an ElasticsearchNode in integration mode when the
node hasn't started yet now throws an exception. This prevents false
positives against already running node on 9200 (since we default to that
port if not already started).

Fixed 2 small unit test failures on PutRole's Names json output

CatSnapshots did a snapshot of all indices, depending on when xunit
decides to run this this could be a very very costly operation. We
always limit to a single index now.

Make sure we forcereseed as default on EnvironmentConfiguration

RoleDetection integration tests still passed extra node settings using
-D hardcoded which caused these integration tests to fail

Author: Mpdreamz

paket.lock

@@ -1,10 +1,7 @@
 NUGET
-  remote: http://api.nuget.org/v3/index.json
-  specs:
-    AsciiDocNet (1.0.0-alpha2)
-    ShellProgressBar (3.0)
   remote: https://www.nuget.org/api/v2
   specs:
+    AsciiDocNet (1.0.0-alpha3)
     Bogus (3.0.5-beta-2)
       Newtonsoft.Json (>= 8.0.2) - framework: >= net40, dnx451, dnxcore50
       System.ComponentModel (>= 4.0.1-beta-23516) - framework: dnxcore50
@@ -351,6 +348,9 @@ NUGET
       System.Threading.Tasks (>= 4.0) - framework: dnxcore50
       xunit.abstractions (>= 2.0) - framework: dnxcore50
       xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, xamarinios, winv4.5, wpv8.0, wpav8.1
+  remote: http://api.nuget.org/v3/index.json
+  specs:
+    ShellProgressBar (3.0)
 
 GROUP build
 NUGET

src/Nest/Nest.csproj

@@ -1269,7 +1269,6 @@
   <ItemGroup>
     <None Include="paket.references" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs

@@ -34,7 +34,8 @@ protected override void IntegrationSetup(IElasticClient client, CallUniqueValues
 				throw new Exception("Setup: failed to create snapshot repository");
 
 			var createIndex = this.Client.CreateIndex(SnapshotIndexName);
-			client.Snapshot(RepositoryName, SnapshotName, s=>s.WaitForCompletion());
+			this.Client.ClusterHealth(g => g.WaitForStatus(WaitForStatus.Yellow));
+			client.Snapshot(RepositoryName, SnapshotName, s=>s.WaitForCompletion().Index(SnapshotIndexName));
 		}
 
 		protected override LazyResponses ClientUsage() => Calls(

src/Tests/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.cs

@@ -114,8 +114,8 @@ public class SniffRoleDetectionCluster : ClusterBase, ICollectionFixture<SniffRo
 	{
 		protected override string[] ServerSettings => new[]
 		{
-			"-Des.node.data=false",
-			"-Des.node.master=true",
+			"es.node.data=false",
+			"es.node.master=true",
 		};
 	}
 

src/Tests/Framework/Configuration/EnvironmentConfiguration.cs

@@ -9,7 +9,7 @@ namespace Tests.Framework.Configuration
 	public class EnvironmentConfiguration : TestConfigurationBase
 	{
 		public override bool DoNotSpawnIfAlreadyRunning { get; protected set; } = false;
-		public override bool ForceReseed { get; protected set; } = false;
+		public override bool ForceReseed { get; protected set; } = true;
 		public override string ElasticsearchVersion { get; protected set; }
 		public override TestMode Mode { get; protected set; } = TestMode.Unit;
 

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

@@ -152,6 +152,8 @@ private ConnectionSettings ClusterSettings(ConnectionSettings s, Func<Connection
 
 		public IElasticClient Client(Func<Uri, IConnectionPool> createPool, Func<ConnectionSettings, ConnectionSettings> settings)
 		{
+			if (!this.Started && TestClient.Configuration.RunIntegrationTests)
+				throw new Exception("can not request a client from an ElasticsearchNode if that node hasn't started yet");
 			var port = this.Started ? this.Port : 9200;
 			settings = settings ?? (s => s);
 			var client = TestClient.GetClient(s => ClusterSettings(s, settings), port, createPool);
@@ -160,13 +162,20 @@ public IElasticClient Client(Func<Uri, IConnectionPool> createPool, Func<Connect
 
 		public IElasticClient Client(Func<ConnectionSettings, ConnectionSettings> settings = null, bool forceInMemory = false)
 		{
+			if (!this.Started && TestClient.Configuration.RunIntegrationTests)
+				throw new Exception("can not request a client from an ElasticsearchNode if that node hasn't started yet");
 			var port = this.Started ? this.Port : 9200;
+			return GetPrivateClient(settings, forceInMemory, port);
+		}
+
+		private IElasticClient GetPrivateClient(Func<ConnectionSettings, ConnectionSettings> settings, bool forceInMemory, int port)
+		{
 			settings = settings ?? (s => s);
 			var client = forceInMemory
 				? TestClient.GetInMemoryClient(s => ClusterSettings(s, settings), port)
 				: TestClient.GetClient(s => ClusterSettings(s, settings), port);
 			return client;
-		}
+		}
 
 		public IObservable<ElasticsearchMessage> Start(string typeOfCluster, string[] additionalSettings = null)
 		{
@@ -288,11 +297,12 @@ private void HandleConsoleMessage(ElasticsearchMessage s, ManualResetEvent handl
 			}
 			else if (s.TryGetStartedConfirmation())
 			{
-				var healthyCluster = this.Client().ClusterHealth(g => g.WaitForStatus(WaitForStatus.Yellow).Timeout(TimeSpan.FromSeconds(30)));
+				var healthyCluster = this.GetPrivateClient(null, false, this.Port)
+					.ClusterHealth(g => g.WaitForStatus(WaitForStatus.Yellow).Timeout(TimeSpan.FromSeconds(30)));
 				if (healthyCluster.IsValid)
 				{
-					this._blockingSubject.OnNext(handle);
 					this.Started = true;
+					this._blockingSubject.OnNext(handle);
 				}
 				else
 				{
@@ -451,12 +461,11 @@ private ConnectionSettings AppendClusterNameToHttpHeaders(ConnectionSettings set
 
 		public void Stop()
 		{
-			if (!this.RunningIntegrations || !this.Started) return;
 
+			var hasStarted = this.Started;
 			this.Started = false;
 
-			Console.WriteLine($"Stopping... ran integrations: {this.RunningIntegrations}");
-			Console.WriteLine($"Node started: {this.Started} on port: {this.Port} using PID: {this.Info?.Pid}");
+			Console.WriteLine($"Stopping... node has started {hasStarted} ran integrations: {this.RunningIntegrations}");
 
 			this._process?.Dispose();
 			this._processListener?.Dispose();
@@ -468,7 +477,10 @@ public void Stop()
 				esProcess.Kill();
 				esProcess.WaitForExit(5000);
 				esProcess.Close();
-			}
+			}
+
+			if (!this.RunningIntegrations || !hasStarted) return;
+			Console.WriteLine($"Node started on port: {this.Port} using PID: {this.Info?.Pid}");
 
 			if (this._doNotSpawnIfAlreadyRunning) return;
 			var dataFolder = Path.Combine(this.RoamingClusterFolder, "data", this.ClusterName);

src/Tests/Tests.csproj

@@ -630,7 +630,6 @@
     <Content Include="ClientConcepts\LowLevel\pipeline.xml" />
     <Content Include="QueryDsl\BoolDsl\hadouken-indentation.jpg" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5.1'">

src/Tests/XPack/Security/Role/PutRole/PutRoleApiTests.cs

@@ -41,7 +41,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			run_as = new [] { "user" },
 			indices = new [] {
 				new {
-					names = "project",
+					names = new [] { "project" },
 					privileges = new [] { "all" },
 					fields = new [] { "name", "description" },
 					query = new { match_all = new {} }

src/Tests/tests.yaml

@@ -1,8 +1,8 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: i
 # the elasticsearch version that should be started
 elasticsearch_version: 2.3.0
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
-force_reseed: false
+force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up
 do_not_spawn: true