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

Fixed merge error in test

Browse source 
Make sure we don't ref a null mesh on rebuild bed
This commit is contained in:
Lars Brubaker 2016-12-07 17:04:35 -08:00
parent ba8f8b08d2
commit 3b526cdc98
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -256,7 +256,6 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName("Select Model", 5, delayBeforeReturn: .5);
testRunner.ClickByName(model + " Menu Item", 5, delayBeforeReturn: .5);
testRunner.ClickByName("Save & Continue Button", 5, delayBeforeReturn: 1); // wait for this window to close
// An unpredictable period of time will pass between Clicking Save, everything reloading and us returning to the caller.
// Block until ReloadAll has completed then close and return to the caller, at which point hopefully everything is reloaded.