backport of #2756

Author: Mpdreamz

build/scripts/Testing.fsx

@@ -19,7 +19,7 @@ module Tests =
     let private buildingOnTravis = getEnvironmentVarAsBool "TRAVIS"
 
     let private setLocalEnvVars() = 
-        let clusterFilter =  getBuildParamOrDefault "escluster" ""
+        let clusterFilter =  getBuildParamOrDefault "clusterfilter" ""
         let testFilter = getBuildParamOrDefault "testfilter" ""
         setProcessEnvironVar "NEST_INTEGRATION_CLUSTER" clusterFilter
         setProcessEnvironVar "NEST_TEST_FILTER" testFilter

src/Tests/Aggregations/Metric/ScriptedMetric/ScriptedMetricAggregationUsageTests.cs

@@ -95,36 +95,20 @@ class Scripted
 
 		private Scripted First = new Scripted
 		{
-			Language = "painless",
-			Init = "params._agg.map = [:]",
-			Map =
-				"if (params._agg.map.containsKey(doc['state'].value))" +
-				"    params._agg.map[doc['state'].value] += 1;" +
-				"else" +
-				"    params._agg.map[doc['state'].value] = 1;",
-
-			Reduce =
-				"def reduce = [:];" +
-				"for (agg in params._aggs)" +
-				"{" +
-				"    for (entry in agg.map.entrySet())" +
-				"    {" +
-				"        if (reduce.containsKey(entry.getKey()))" +
-				"            reduce[entry.getKey()] += entry.getValue();" +
-				"        else" +
-				"            reduce[entry.getKey()] = entry.getValue();" +
-				"    }" +
-				"}" +
-				"return reduce;"
+			Language = "groovy",
+			Combine = "sum = 0; for (c in _agg.commits) { sum += c }; return sum",
+			Reduce = "sum = 0; for (a in _aggs) { sum += a }; return sum",
+			Map = "if (doc['state'].value == \"Stable\") { _agg.commits.add(doc['numberOfCommits']) }",
+			Init = "_agg['commits'] = []"
 		};
 
 		private Scripted Second = new Scripted
 		{
-			Language = "painless",
-			Combine = "def sum = 0.0; for (c in params._agg.commits) { sum += c } return sum",
-			Reduce = "def sum = 0.0; for (a in params._aggs) { sum += a } return sum",
-			Map = "if (doc['state'].value == \"Stable\") { params._agg.commits.add(doc['numberOfCommits'].value) }",
-			Init = "params._agg.commits = []"
+			Language = "groovy",
+			Combine = "sum = 0; for (c in _agg.commits) { sum += c }; return sum",
+			Reduce = "sum = 0; for (a in _aggs) { sum += a }; return sum",
+			Map = "if (doc['state'].value == \"Stable\") { _agg.commits.add(doc['numberOfCommits']) }",
+			Init = "_agg['commits'] = []"
 		};
 
 		public ScriptedMetricMultiAggregationTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -147,6 +131,11 @@ public ScriptedMetricMultiAggregationTests(ReadOnlyCluster i, EndpointUsage usag
 							inline = First.Map,
 							lang = First.Language
 						},
+						combine_script = new
+						{
+							inline = First.Combine,
+							lang = First.Language
+						},
 						reduce_script = new
 						{
 							inline = First.Reduce,
@@ -188,6 +177,7 @@ public ScriptedMetricMultiAggregationTests(ReadOnlyCluster i, EndpointUsage usag
 				.ScriptedMetric("by_state_total", sm => sm
 					.InitScript(ss => ss.Inline(First.Init).Lang(First.Language))
 					.MapScript(ss => ss.Inline(First.Map).Lang(First.Language))
+					.CombineScript(ss => ss.Inline(First.Combine).Lang(First.Language))
 					.ReduceScript(ss => ss.Inline(First.Reduce).Lang(First.Language))
 				)
 				.ScriptedMetric("total_commits", sm => sm
@@ -206,6 +196,7 @@ public ScriptedMetricMultiAggregationTests(ReadOnlyCluster i, EndpointUsage usag
 					{
 						InitScript = new InlineScript(First.Init) {Lang = First.Language},
 						MapScript = new InlineScript(First.Map) {Lang = First.Language},
+						CombineScript = new InlineScript(First.Combine) {Lang = First.Language},
 						ReduceScript = new InlineScript(First.Reduce) {Lang = First.Language}
 					} &&
 					new ScriptedMetricAggregation("total_commits")
@@ -226,7 +217,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			by_state_total.Should().NotBeNull();
 			total_commits.Should().NotBeNull();
 
-			by_state_total.Value<IDictionary<string, int>>().Should().NotBeNull();
+			by_state_total.Value<double>().Should().BeGreaterThan(0);
 			total_commits.Value<int>().Should().BeGreaterThan(0);
 		}
 	}

src/Tests/Framework/Xunit/TestFrameworkExecutor.cs

@@ -15,8 +15,17 @@ public TestFrameworkExecutor(AssemblyName assemblyName, ISourceInformationProvid
 
 		protected override async void RunTestCases(IEnumerable<IXunitTestCase> testCases, IMessageSink executionMessageSink, ITestFrameworkExecutionOptions executionOptions)
 		{
-			using (var assemblyRunner = new TestAssemblyRunner(TestAssembly, testCases, DiagnosticMessageSink, executionMessageSink, executionOptions))
-				await assemblyRunner.RunAsync();
+			try
+			{
+                using (var assemblyRunner = new TestAssemblyRunner(TestAssembly, testCases, DiagnosticMessageSink, executionMessageSink, executionOptions))
+                    await assemblyRunner.RunAsync();
+
+			}
+			catch (Exception e)
+			{
+				Console.WriteLine(e);
+				throw;
+			}
 		}
 	}
 }