Timeout while setting the water flow handled correctly: message displayed, test aborted

This commit is contained in:
Milan Hanajik
2015-01-12 05:56:19 +01:00
parent 0829655880
commit 34dc592e59
9 changed files with 65 additions and 24 deletions
@@ -132,8 +132,13 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error; goto stopTest; }
if (e.Contains(Event.Next)) goto flow_set;
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Timeout);
retVal = Event.Done;
goto stopTest;
}
if (e.Contains(Event.Next)) goto flow_set;
}
while (!e.Contains(Event.FlowReached));