diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2018-09-28 10:18:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 10:18:51 +0300 |
| commit | 6c0e4d7e0005500a0d9c0e50f40f739ec73a325d (patch) | |
| tree | 0d75ca76c319d9c22ba4871fc60fae65f6098f31 /main/src/addins/MonoDevelop.UnitTesting | |
| parent | c2984fcb996771936c8bcceb3df1b317ed692142 (diff) | |
| parent | db49334169135b8b9ef15e461ca83c0cc0d87075 (diff) | |
Merge pull request #6116 from mono/master-issue6014
Fixes issue #6014 [Regression] Unit-tests execution
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting')
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs | 8 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs index 64d2f18591..235d0213f1 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs @@ -481,10 +481,15 @@ namespace MonoDevelop.UnitTesting void OnStopClicked (object sender, EventArgs args) { + StopRunningTests (); + } + + void StopRunningTests () + {
if (runningTestOperation != null) runningTestOperation.Cancel (); } - + UnitTest GetSelectedTest () { ITreeNavigator nav = TreeView.GetSelectedNode (); @@ -538,6 +543,7 @@ namespace MonoDevelop.UnitTesting if (bringToFront) IdeApp.Workbench.GetPad<TestPad> ().BringToFront (); + StopRunningTests (); runningTestOperation = UnitTestService.RunTests (tests, context); runningTestOperation.Task.ContinueWith (t => OnTestSessionCompleted (), TaskScheduler.FromCurrentSynchronizationContext ()); return runningTestOperation; diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs index f846b414ed..4b845b9298 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs @@ -129,9 +129,8 @@ namespace MonoDevelop.UnitTesting if (t.OwnerObject is IBuildTarget bt) build_targets.Add (bt); } - var res = await IdeApp.ProjectOperations.CheckAndBuildForExecute ( - build_targets, IdeApp.Workspace.ActiveConfiguration, IdeApp.Preferences.BuildBeforeRunningTests, + build_targets, IdeApp.Workspace.ActiveConfiguration, buildWithoutPrompting: !IdeApp.Preferences.BuildBeforeRunningTests, false, null, cs.Token); if (!res) |