|
@@ -119,13 +119,10 @@ SATHTTP::STCase* CSATExecutor::ExecuteFreeCaseScript(SATHTTP::STTask* pTask)
|
|
|
// 设置用例对象;
|
|
|
pExcutor->SetCaseObje(pCase);
|
|
|
pExcutor->StartScript();
|
|
|
- // 标记用例执行中;
|
|
|
- pCase->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
- }
|
|
|
- else { // 标记脚本失败;
|
|
|
- pCase->_nExecutionResult = SATHTTP::FAIL;
|
|
|
}
|
|
|
|
|
|
+ // 标记用例执行中;
|
|
|
+ pCase->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
// 标记任务为执行中;
|
|
|
pTask->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
// 记录开始时间;
|
|
@@ -134,7 +131,18 @@ SATHTTP::STCase* CSATExecutor::ExecuteFreeCaseScript(SATHTTP::STTask* pTask)
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- //CScriptExecutor *pExcutor = (CScriptExecutor *)pCase->_pExcutor;
|
|
|
+ // 重新初始化脚本;
|
|
|
+ CPythonExecutor *pExcutor = (CPythonExecutor *)pCase->_pExcutor;
|
|
|
+ if ( pExcutor->InitScript(pCase->_strScriptPath, pCase->_strCaseLog, "") ) {
|
|
|
+ // 设置用例对象;
|
|
|
+ pExcutor->SetCaseObje(pCase);
|
|
|
+ pExcutor->StartScript();
|
|
|
+ // 标记用例执行中;
|
|
|
+ pCase->_nExecutionState = SATHTTP::INEXECUTED;
|
|
|
+ }
|
|
|
+ else { // 如果再次初始化失败,标记脚本失败;
|
|
|
+ pCase->_nExecutionResult = SATHTTP::FAIL;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|