nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve threading issues

Browse source
This commit is contained in:
John Lewin 2017-10-05 18:04:45 -07:00
parent c51e779bdc
commit 764b571127
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -494,17 +494,23 @@ namespace MatterHackers.MatterControl.Tests.Automation
// Extract mouse speed from config
AutomationRunner.TimeToMoveMouse = config.TimeToMoveMouse;
await AutomationRunner.ShowWindowAndExecuteTests(matterControlWindow, testMethod, maxTimeToRun, defaultTestImages, config.AutomationInputType, () =>
{
if (ApplicationController.Instance.ActivePrinter.Connection.CommunicationState == CommunicationStates.Printing)
await AutomationRunner.ShowWindowAndExecuteTests(
matterControlWindow,
testMethod,
maxTimeToRun,
defaultTestImages,
config.AutomationInputType,
closeWindow: () =>
{
ApplicationController.Instance.ActivePrinter.Connection.Disable();
}
if (ApplicationController.Instance.ActivePrinter.Connection.CommunicationState == CommunicationStates.Printing)
{
ApplicationController.Instance.ActivePrinter.Connection.Disable();
}
MatterControlApplication app = MatterControlApplication.Instance;
app.RestartOnClose = false;
app.Close();
});
MatterControlApplication app = MatterControlApplication.Instance;
app.RestartOnClose = false;
app.Close();
});
}
public static void LibraryAddSelectionToQueue(AutomationRunner testRunner)