1,修复节点重试次数累加问题(临时措施)
2,在调试和测试页面,增加测试中结果实时刷新功能
This commit is contained in:
@@ -23,6 +23,18 @@ Namespace UTSModule.Test
|
||||
Public Property TestReturn() As TestCommandReturn
|
||||
End Class
|
||||
|
||||
Public Class TestNodeResultChangedEventArgs
|
||||
Inherits EventArgs
|
||||
|
||||
Sub New(node As RowNode, testReturn As TestCommandReturn)
|
||||
Me.Node = node
|
||||
Me.TestReturn = testReturn
|
||||
End Sub
|
||||
|
||||
Public Property Node() As RowNode
|
||||
|
||||
Public Property TestReturn() As TestCommandReturn
|
||||
End Class
|
||||
|
||||
Public Class TestNodeChangedEventArgs
|
||||
Inherits EventArgs
|
||||
@@ -136,6 +148,9 @@ Namespace UTSModule.Test
|
||||
'''<summary>测试节点完成事件</summary>
|
||||
Public Event TestNodeCompleted(sender As Object, e As TestNodeCompletedEventArgs)
|
||||
|
||||
'''<summary>测试节点结果变化事件</summary>
|
||||
Public Event TestNodeResultChanged(sender As Object, e As TestNodeResultChangedEventArgs)
|
||||
|
||||
'''<summary>测试时间变更事件</summary>
|
||||
Public Event TestTimeChanged(sender As Object, e As TestTimeEventArgs)
|
||||
|
||||
@@ -599,6 +614,10 @@ Namespace UTSModule.Test
|
||||
'判断节点是否为重试状态
|
||||
If retry > 0 Then node.IsRetry = True
|
||||
|
||||
If localVariable IsNot Nothing AndAlso localVariable.ContainsKey("CH") Then
|
||||
Console.WriteLine($"CH:{localVariable("CH")} Label:{node.Label} Desc:{node.Description} RetryCount:{retry} IsRetry:{node.IsRetry}")
|
||||
End If
|
||||
|
||||
'重置模块测试结果
|
||||
result.ExecuteResult = True
|
||||
|
||||
@@ -617,6 +636,8 @@ Namespace UTSModule.Test
|
||||
Thread.Sleep(node.RetryInterval) '执行失败,休眠重试间隔
|
||||
Next
|
||||
|
||||
node.IsRetry = True 'todo:临时解决call命令调用函数时多层级模块 节点变更与节点完成的非唯一节点bug
|
||||
|
||||
Return result
|
||||
End Function
|
||||
|
||||
@@ -762,6 +783,7 @@ Namespace UTSModule.Test
|
||||
|
||||
'执行成功一次则判定成功,退出执行
|
||||
result = executor.Execute()
|
||||
RaiseEvent TestNodeResultChanged(Me, New TestNodeResultChangedEventArgs(node, result))
|
||||
If result.ExecuteResult Then Exit For
|
||||
|
||||
'执行失败,休眠重试间隔
|
||||
|
||||
Reference in New Issue
Block a user