build integrate <version> now accepts a third parameter <clusterfilter> which allows you to run specific cluster integration test more easily e.g build integrate 5.0.1 xpack

Mpdreamz · Mpdreamz · commit dc2afc0c4776 · 2016-11-21T15:29:49.000+01:00
Conflicts:
	src/Tests/Framework/Configuration/EnvironmentConfiguration.cs
	src/Tests/Framework/Configuration/ITestConfiguration.cs
	src/Tests/Framework/Configuration/NodeConfiguration.cs
	src/Tests/Framework/Configuration/TestConfigurationBase.cs
	src/Tests/Framework/Configuration/YamlConfiguration.cs
	src/Tests/Framework/Xunit/TestAssemblyRunner.cs
	src/Tests/tests.yaml
diff --git a/build.bat b/build.bat
@@ -4,7 +4,7 @@ REM build
 REM build build [skiptests]
 REM build release [version] [skiptests]
 REM build version [version] [skiptests]
-REM build integrate [elasticsearch_versions] [skiptests]
+REM build integrate [elasticsearch_versions] [clustername]
 REM build canary [apikey] [feed] [skiptests]
 
 REM - elasticsearch_versions can be multiple separated with a semi-colon ';'
@@ -24,7 +24,8 @@ SET ESVERSIONS=
 SET SKIPTESTS=0
 SET APIKEY=
 SET APIKEYPROVIDED="<empty>"
-SET FEED="elasticsearch-net"
+SET FEED="elasticsearch-net"
+SET NEST_INTEGRATION_CLUSTER=
 
 IF /I "%1"=="skiptests" (
 	set SKIPTESTS="1"
@@ -46,8 +47,7 @@ IF /I "%1"=="release" (
 
 IF /I "%1%"=="integrate" (
 	IF NOT [%2]==[] (set ESVERSIONS="%2")
-	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
-	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
+	IF NOT [%3]==[] (set NEST_INTEGRATION_CLUSTER="%3")
 )
 
 IF /I "%1%"=="canary" (
@@ -61,5 +61,5 @@ IF /I "%1%"=="canary" (
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 
-ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEYPROVIDED% feed=%FEED%
-"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%"
+ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEYPROVIDED% feed=%FEED% escluster=%NEST_INTEGRATION_CLUSTER%
+"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%" "escluster=%NEST_INTEGRATION_CLUSTER%"
diff --git a/build/scripts/Targets.fsx b/build/scripts/Targets.fsx
@@ -29,7 +29,7 @@ Target "Test"  <| fun _ -> Tests.RunUnitTests()
     
 Target "QuickTest"  <| fun _ -> Tests.RunUnitTests()
 
-Target "Integrate"  <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "")
+Target "Integrate"  <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "") (getBuildParamOrDefault "escluster" "")
 
 Target "Profile" <| fun _ -> Profiler.Run()
 
diff --git a/build/scripts/Testing.fsx b/build/scripts/Testing.fsx
@@ -27,12 +27,13 @@ module Tests =
         testProjectJson "all"
 
 
-    let RunIntegrationTests() commaSeparatedEsVersions =
+    let RunIntegrationTests() commaSeparatedEsVersions clusterFilter =
         let esVersions = 
             match commaSeparatedEsVersions with
             | "" -> failwith "when running integrate you have to pass a comma separated list of elasticsearch versions to test"
             | _ -> commaSeparatedEsVersions.Split ',' |> Array.toList 
         
         for esVersion in esVersions do
+            setProcessEnvironVar "NEST_INTEGRATION_CLUSTER" clusterFilter
             setProcessEnvironVar "NEST_INTEGRATION_VERSION" esVersion
             testDesktopClr "all"
diff --git a/src/Tests/Framework/Configuration/EnvironmentConfiguration.cs b/src/Tests/Framework/Configuration/EnvironmentConfiguration.cs
@@ -12,6 +12,7 @@ public class EnvironmentConfiguration : TestConfigurationBase
 		public override bool ForceReseed { get; protected set; } = true;
 		public override string ElasticsearchVersion { get; protected set; }
 		public override TestMode Mode { get; protected set; } = TestMode.Unit;
+		public override string ClusterFilter { get; protected set; }
 
 		public EnvironmentConfiguration()
 		{
@@ -20,6 +21,7 @@ public EnvironmentConfiguration()
 			this.ElasticsearchVersion = Environment.GetEnvironmentVariable("NEST_INTEGRATION_VERSION");
 			if (!string.IsNullOrEmpty(ElasticsearchVersion))
 				Mode = TestMode.Integration;
+			this.ClusterFilter = Environment.GetEnvironmentVariable("NEST_INTEGRATION_CLUSTER");
 		}
 	}
 }
diff --git a/src/Tests/Framework/Configuration/ITestConfiguration.cs b/src/Tests/Framework/Configuration/ITestConfiguration.cs
@@ -10,6 +10,7 @@ public interface ITestConfiguration
 	{
 		TestMode Mode { get; }
 		string ElasticsearchVersion { get; }
+		string ClusterFilter { get; }
 		bool ForceReseed { get; } 
 		bool DoNotSpawnIfAlreadyRunning { get; }
 
diff --git a/src/Tests/Framework/Configuration/TestConfigurationBase.cs b/src/Tests/Framework/Configuration/TestConfigurationBase.cs
@@ -12,6 +12,7 @@ public abstract class TestConfigurationBase : ITestConfiguration
 		public abstract string ElasticsearchVersion { get; protected set; }
 		public abstract bool ForceReseed { get; protected set; } 
 		public abstract TestMode Mode { get; protected set; }
+		public abstract string ClusterFilter { get; protected set; }
 
 		public virtual bool RunIntegrationTests => Mode == TestMode.Mixed || Mode == TestMode.Integration;
 		public virtual bool RunUnitTests => Mode == TestMode.Mixed || Mode == TestMode.Unit;
diff --git a/src/Tests/Framework/Configuration/YamlConfiguration.cs b/src/Tests/Framework/Configuration/YamlConfiguration.cs
@@ -10,7 +10,7 @@ public class YamlConfiguration : TestConfigurationBase
 		public override string ElasticsearchVersion { get; protected set; } = "2.0.0";
 		public override bool ForceReseed { get; protected set; } = true;
 		public override TestMode Mode { get; protected set; } = TestMode.Unit;
-
+		public override string ClusterFilter { get; protected set; }
 
 		public YamlConfiguration(string configurationFile)
 		{
@@ -24,6 +24,7 @@ public YamlConfiguration(string configurationFile)
 			this.ElasticsearchVersion = config["elasticsearch_version"];
 			this.ForceReseed = bool.Parse(config["force_reseed"]);
 			this.DoNotSpawnIfAlreadyRunning = bool.Parse(config["do_not_spawn"]);
+			this.ClusterFilter = config["cluster_filter"];
 		}
 
 		private static string ConfigName(string configLine) => Parse(configLine, 0);
diff --git a/src/Tests/Framework/Xunit/TestAssemblyRunner.cs b/src/Tests/Framework/Xunit/TestAssemblyRunner.cs
@@ -64,15 +64,18 @@ orderby g.Count() descending
 
 			var summaries = new ConcurrentBag<RunSummary>();
 			var clusterTotals = new Dictionary<string, Stopwatch>();
+			var clusterFilter = TestClient.Configuration.ClusterFilter;
 			foreach (var group in grouped)
 			{
 				var type = group.Key?.GetType();
 				var clusterName = type?.Name.Replace("Cluster", "") ?? "UNKNOWN";
-				var dop = group.Key != null && group.Key.MaxConcurrency > 0 
-                    ? group.Key.MaxConcurrency
-                    : defaultMaxConcurrency;
 
-				//if (type != typeof(ReadOnlyCluster)) continue;
+				if (!string.IsNullOrWhiteSpace(clusterFilter) && !string.Equals(clusterName, clusterFilter, StringComparison.InvariantCultureIgnoreCase))
+					continue;
+
+				var dop = group.Key != null && group.Key.MaxConcurrency > 0
+					? group.Key.MaxConcurrency
+					: defaultMaxConcurrency;
 
 				clusterTotals.Add(clusterName, Stopwatch.StartNew());
 
diff --git a/src/Tests/Framework/Xunit/TestFramework.cs b/src/Tests/Framework/Xunit/TestFramework.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Reflection;
 using Tests.Framework;
+using Tests.Framework.Configuration;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -19,7 +20,9 @@ protected override ITestFrameworkExecutor CreateExecutor(AssemblyName assemblyNa
 			Console.WriteLine($" - {nameof(config.DoNotSpawnIfAlreadyRunning)}: {config.DoNotSpawnIfAlreadyRunning}");
 			Console.WriteLine($" - {nameof(config.ElasticsearchVersion)}: {config.ElasticsearchVersion}");
 			Console.WriteLine($" - {nameof(config.ForceReseed)}: {config.ForceReseed}");
-			Console.WriteLine($" - {nameof(config.Mode)}: {config.Mode.ToString()}");
+			Console.WriteLine($" - {nameof(config.Mode)}: {config.Mode.ToString()}");
+			if (config.Mode == TestMode.Integration)
+				Console.WriteLine($" - {nameof(config.ClusterFilter)}: {config.ClusterFilter}");
 			Console.WriteLine($" - {nameof(config.RunIntegrationTests)}: {config.RunIntegrationTests}");
 			Console.WriteLine($" - {nameof(config.RunUnitTests)}: {config.RunUnitTests}");
 
diff --git a/src/Tests/tests.yaml b/src/Tests/tests.yaml
@@ -2,6 +2,8 @@
 mode: m
 # the elasticsearch version that should be started
 elasticsearch_version: 2.4.1
+# cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
+cluster_filter: 
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class EnvironmentConfiguration : TestConfigurationBase`
`12`	`12`	`public override bool ForceReseed { get; protected set; } = true;`
`13`	`13`	`public override string ElasticsearchVersion { get; protected set; }`
`14`	`14`	`public override TestMode Mode { get; protected set; } = TestMode.Unit;`
	`15`	`+ public override string ClusterFilter { get; protected set; }`
`15`	`16`
`16`	`17`	`public EnvironmentConfiguration()`
`17`	`18`	`{`
`@@ -20,6 +21,7 @@ public EnvironmentConfiguration()`
`20`	`21`	`this.ElasticsearchVersion = Environment.GetEnvironmentVariable("NEST_INTEGRATION_VERSION");`
`21`	`22`	`if (!string.IsNullOrEmpty(ElasticsearchVersion))`
`22`	`23`	`Mode = TestMode.Integration;`
	`24`	`+ this.ClusterFilter = Environment.GetEnvironmentVariable("NEST_INTEGRATION_CLUSTER");`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public interface ITestConfiguration`
`10`	`10`	`{`
`11`	`11`	`TestMode Mode { get; }`
`12`	`12`	`string ElasticsearchVersion { get; }`
	`13`	`+ string ClusterFilter { get; }`
`13`	`14`	`bool ForceReseed { get; }`
`14`	`15`	`bool DoNotSpawnIfAlreadyRunning { get; }`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class YamlConfiguration : TestConfigurationBase`
`10`	`10`	`public override string ElasticsearchVersion { get; protected set; } = "2.0.0";`
`11`	`11`	`public override bool ForceReseed { get; protected set; } = true;`
`12`	`12`	`public override TestMode Mode { get; protected set; } = TestMode.Unit;`
`13`		`-`
	`13`	`+ public override string ClusterFilter { get; protected set; }`
`14`	`14`
`15`	`15`	`public YamlConfiguration(string configurationFile)`
`16`	`16`	`{`
`@@ -24,6 +24,7 @@ public YamlConfiguration(string configurationFile)`
`24`	`24`	`this.ElasticsearchVersion = config["elasticsearch_version"];`
`25`	`25`	`this.ForceReseed = bool.Parse(config["force_reseed"]);`
`26`	`26`	`this.DoNotSpawnIfAlreadyRunning = bool.Parse(config["do_not_spawn"]);`
	`27`	`+ this.ClusterFilter = config["cluster_filter"];`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`private static string ConfigName(string configLine) => Parse(configLine, 0);`