|
@@ -125,7 +125,7 @@ SATHTTP::STCase* CSATExecutor::GetFreeCaseScript(std::vector<SATHTTP::STCase> &v
|
|
|
|
|
|
SATHTTP::STCase* CSATExecutor::ExecuteFreeCaseScript(SATHTTP::STTask* pTask)
|
|
|
{
|
|
|
- // 多取未执行的脚本;
|
|
|
+ // 获取未执行的脚本;
|
|
|
SATHTTP::STCase* pCase = GetFreeCaseScript(pTask->Job.vtCases);
|
|
|
if (pCase) {
|
|
|
if ( !pCase->_pExcutor ) {
|
|
@@ -1054,6 +1054,11 @@ DWORD CSATExecutor::HearbeatThread(LPVOID lpVoid)
|
|
|
if ( !that ) return 0;
|
|
|
|
|
|
do {
|
|
|
+ // 如果未启用电视监听,启用实时读取配置文件;
|
|
|
+ if ( that->m_bStopWathTV ) {
|
|
|
+ GLOBAL::GetIniInfo();
|
|
|
+ }
|
|
|
+
|
|
|
// 没有登录成功,不查询;
|
|
|
if ( !that->m_bLogin ) continue;
|
|
|
// 更新设备;
|
|
@@ -1171,7 +1176,7 @@ DWORD CSATExecutor::ExecuteScriptThread(LPVOID lpVoid)
|
|
|
pCase = that->ExecuteFreeCaseScript(pTask);
|
|
|
if ( NULL == pCase ) {
|
|
|
// 没有空闲的用例可执行,说明所有用例已执行完成;
|
|
|
- pTask->_nExecutionState = 2;
|
|
|
+ pTask->_nExecutionState = SATHTTP::EXECUTED;
|
|
|
// 上报任务完成;
|
|
|
that->ReportTaskFinish(pTask);
|
|
|
// 上报任务结果;
|
|
@@ -1196,13 +1201,13 @@ DWORD CSATExecutor::ExecuteScriptThread(LPVOID lpVoid)
|
|
|
pExcutor->InitScript(_case->_strScriptPath, _case->_strFileDir + "\\" + _case->_strFileName + ".txt", "");
|
|
|
pExcutor->StartScript();
|
|
|
// 标记用例执行中;
|
|
|
- _case->_nExecutionState = 1;
|
|
|
+ _case->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 标记任务为执行中;
|
|
|
- pTask->_nExecutionState = 1;
|
|
|
+ pTask->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
}
|
|
|
else {
|
|
|
GLOBAL::WriteTextLog(_T("\n<===============================================>\n# 1、开始执行任务:%s, 用例数量:%ld#\n<===============================================>\n"),
|