Integrations test suite improvements

JAVA_HOME is not necessary for the bat files anymore but the shield bat
files do not have the same JAVA_HOME path guessing so they bork. Causing
a rather nasty AppDomainUnloaded exception which obfuscates the true
cause.

Similarly a bad x-pack license behaved the exact same.

Improved error reporting to adduser in the bootstrap for the xpack
cluster.

Also added SkipVersions for integration tests against 5.0 and <5.1

Author: Mpdreamz

build.bat

@@ -24,7 +24,7 @@ SET ESVERSIONS=
 SET SKIPTESTS=0
 SET APIKEY=
 SET APIKEYPROVIDED="<empty>"
-SET FEED="elasticsearch-net"
+SET FEED="elasticsearch-net"
 SET NEST_INTEGRATION_CLUSTER=
 SET NEST_TEST_FILTER=
 
@@ -44,12 +44,20 @@ IF /I "%1"=="release" (
 	IF NOT [%2]==[] (set VERSION="%2")
 	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
+	IF /I "%JAVA_HOME%"=="" (
+	   ECHO JAVA_HOME not set exiting release early!
+	   EXIT /B 1
+	)
 )
 
 IF /I "%1%"=="integrate" (
 	IF NOT [%2]==[] (set ESVERSIONS="%2")
 	IF NOT [%3]==[] (set NEST_INTEGRATION_CLUSTER="%3")
 	IF NOT [%4]==[] (set NEST_TEST_FILTER="%4")
+	IF /I "%JAVA_HOME%"=="" (
+	   ECHO JAVA_HOME not set exiting integration tests early!
+	   EXIT /B 1
+	)
 )
 
 IF /I "%1%"=="canary" (

src/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs

@@ -7,6 +7,7 @@
 
 namespace Tests.Cat.CatTemplates
 {
+	[SkipVersion("<5.1.0", "CatTemplates is an API introduced in 5.1")]
 	public class CatTemplatesApiTests : ApiIntegrationTestBase<ReadOnlyCluster, ICatResponse<CatTemplatesRecord>, ICatTemplatesRequest, CatTemplatesDescriptor, CatTemplatesRequest>
 	{
 		public CatTemplatesApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }

src/Tests/Framework/ManagedElasticsearch/FileSystem/TestRunnerFileSystem.cs

@@ -63,6 +63,7 @@ private void DownloadAndExtractElasticsearch()
 				if (!Directory.Exists(this.RoamingFolder))
 					Directory.CreateDirectory(this.RoamingFolder);
 
+				EnsureJavaHome();
 				DownloadDistributionZip();
 				UnzipDistribution();
 				CreateHelperBatFile();
@@ -239,29 +240,57 @@ private void EnsureWatcherActionConfigurations()
 			if (saveFile) File.WriteAllLines(rolesConfig, lines);
 		}
 
+		private void EnsureJavaHome()
+		{
+#if DOTNETCORE
+			var javaHome = Environment.GetEnvironmentVariable("JAVA_HOME");
+#else
+			var javaHome = Environment.GetEnvironmentVariable("JAVA_HOME", EnvironmentVariableTarget.Machine)
+				?? Environment.GetEnvironmentVariable("JAVA_HOME", EnvironmentVariableTarget.User);
+#endif
+			if (string.IsNullOrWhiteSpace(javaHome))
+				throw new Exception("The elasticsearch bat files are resillient to JAVA_HOME not being set, however the shield tooling is not");
+		}
+
 		private void EnsureShieldAdmin()
 		{
 			if (!this._config.XPackEnabled) return;
 
+
 			var folder = this.Version.Major >= 5 ? "x-pack" : "shield";
 			var plugin = this.Version.Major >= 5 ? "users" : "esusers";
 
 			EnsureRoles(folder);
+			var timeout = TimeSpan.FromMinutes(1);
+
 			var pluginBat = Path.Combine(this.ElasticsearchHome, "bin", folder, plugin) + ".bat";
 			foreach (var cred in ShieldInformation.AllUsers)
 			{
-				var processInfo = new ProcessStartInfo
+				var handle = new ManualResetEvent(false);
+				Task.Run(() =>
 				{
-					FileName = pluginBat,
-					Arguments = $"useradd {cred.Username} -p {cred.Password} -r {cred.Role}",
-					CreateNoWindow = true,
-					UseShellExecute = false,
-					RedirectStandardOutput = false,
-					RedirectStandardError = false,
-					RedirectStandardInput = false
-				};
-				var p = Process.Start(processInfo);
-				p.WaitForExit();
+					using (var p = new ObservableProcess(pluginBat, $"useradd {cred.Username} -p {cred.Password} -r {cred.Role}"))
+					{
+						var o = p.Start();
+						Console.WriteLine($"Calling: {pluginBat} useradd {cred.Username}");
+						o.Subscribe(
+							//c=>Console.WriteLine(c.Data),
+							c => { },
+							(e) =>
+							{
+								handle.Set();
+								throw e;
+							},
+							() =>
+							{
+								handle.Set();
+							});
+						if (!handle.WaitOne(timeout, true))
+							throw new Exception($"Could not add user {cred.Username} within {timeout}");
+					}
+				});
+				if (!handle.WaitOne(timeout, true))
+					throw new Exception($"Could not add user {cred.Username} within {timeout}");
 			}
 		}
 

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

@@ -131,6 +131,8 @@ public IObservable<ElasticsearchConsoleOut> Start(string[] additionalSettings =
 		private Exception Exception { get; set; }
 		private void Fatal(XplatManualResetEvent handle, Exception exception = null)
 		{
+			Console.WriteLine("FATAL called: " + exception?.Message);
+
 			if (exception != null) this.Exception = exception;
 			handle?.Set();
 			this.Stop();

src/Tests/Framework/Xunit/TestAssemblyRunner.cs

@@ -73,8 +73,7 @@ orderby g.Count() descending
 				var type = group.Key?.GetType();
 				var clusterName = type?.Name.Replace("Cluster", "") ?? "UNKNOWN";
 
-				if (!string.IsNullOrWhiteSpace(clusterFilter) &&
-				    !string.Equals(clusterName, clusterFilter, StringComparison.OrdinalIgnoreCase))
+				if (!string.IsNullOrWhiteSpace(clusterFilter) && clusterName.IndexOf(clusterFilter, StringComparison.OrdinalIgnoreCase) < 0)
 					continue;
 
 				var dop = group.Key != null && group.Key.MaxConcurrency > 0
@@ -91,8 +90,7 @@ orderby g.Count() descending
 					await group.ForEachAsync(dop, async g =>
 					{
 						var test = g.Collection.DisplayName.Replace("Test collection for", "");
-						if (!string.IsNullOrWhiteSpace(testFilter) &&
-						    test.IndexOf(testFilter, StringComparison.OrdinalIgnoreCase) < 0)
+						if (!string.IsNullOrWhiteSpace(testFilter) && test.IndexOf(testFilter, StringComparison.OrdinalIgnoreCase) < 0)
 							return;
 
 						//display tests we execute when we filter so we get confirmation on the command line we run the tests we expect

src/Tests/Indices/StatusManagement/Upgrade/UpgradeApiTests.cs

@@ -9,6 +9,7 @@
 
 namespace Tests.Indices.StatusManagement.Upgrade
 {
+	[SkipVersion("<=5.0.0", "AllowNoIndices() only available from 5.0.1 onwards")]
 	public class UpgradeApiTests
 		: ApiIntegrationAgainstNewIndexTestBase
 			<IntrusiveOperationCluster, IUpgradeResponse, IUpgradeRequest, UpgradeDescriptor, UpgradeRequest>