diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs index 1a735b9d..e035f596 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs @@ -136,7 +136,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests await testService.RunQueryAndWaitToStart(queryTempFile.FilePath, 50000); await testService.ExecuteWithTimeout(timer, 500000, async () => { - var queryResult = await testService.ExecuteSubset(queryTempFile.FilePath, 0, 0, 0, 100); + var queryResult = await testService.ExecuteSubset(queryTempFile.FilePath, 0, 0, 0, 50); if (queryResult != null) { Assert.NotNull(queryResult); diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceDriverProvider.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceDriverProvider.cs index bed93500..fa8889d3 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceDriverProvider.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestServiceDriverProvider.cs @@ -5,6 +5,7 @@ using System; using System.Runtime.CompilerServices; +using System.Threading; using System.Threading.Tasks; using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; @@ -434,8 +435,15 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common for (int i = 0; i < TestRunner.Instance.NumberOfRuns; i++) { Console.WriteLine("Iteration Number: " + i); - - await testToRun(timer); + try + { + await testToRun(timer); + } + catch(Exception ex) + { + Console.WriteLine("Iteration Failed: " + ex.Message); + } + Thread.Sleep(5000); } timer.Print(testName); } diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestTimer.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestTimer.cs index f81c3762..046156a4 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestTimer.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestTimer.cs @@ -73,11 +73,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common double elapsed = Percentile(iterationArray, 0.5); var currentColor = Console.ForegroundColor; Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "Test Name: {0} Run time in milliSeconds: {1}", testName, TotalMilliSeconds)); + Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "Test Name: {0} Run time in milliSeconds: {1}", testName, elapsed)); Console.ForegroundColor = currentColor; string resultContent = Newtonsoft.Json.JsonConvert.SerializeObject(new TestResult { - ElapsedTime = TotalMilliSeconds, + ElapsedTime = elapsed, MetricValue = elapsed, PrimaryMetric = "ElapsedTimeMetric", Iterations = iterationArray,