|
@@ -608,7 +608,7 @@ bool CSATExecutor::ReportCaseFinish(SATHTTP::STTask* pTask, SATHTTP::STCase *pCa
|
|
stJobProcessReq.strTaskId = pTask->Job.strTaskId;
|
|
stJobProcessReq.strTaskId = pTask->Job.strTaskId;
|
|
stJobProcessReq.strAnalysis = "";
|
|
stJobProcessReq.strAnalysis = "";
|
|
// 设备名称:即DeviceSerial;
|
|
// 设备名称:即DeviceSerial;
|
|
- stJobProcessReq.strDevnceName = pTask->Job.strDeviceId; // 命名及其不范围,一会deviceid是deviceserial,一会是id;
|
|
|
|
|
|
+ stJobProcessReq.strDevnceName = pTask->Job.strDeviceId; // 命名极其不范围,一会deviceid是deviceserial,一会是id;
|
|
// 固定为:TOTAL
|
|
// 固定为:TOTAL
|
|
stJobProcessReq.strInfoType = "TOTAL";
|
|
stJobProcessReq.strInfoType = "TOTAL";
|
|
// 如果是Android设备,需要通过adb获取;
|
|
// 如果是Android设备,需要通过adb获取;
|
|
@@ -634,6 +634,15 @@ bool CSATExecutor::ReportCaseResult(SATHTTP::STTask* pTask, SATHTTP::STCase *pCa
|
|
std::string xmlpath = GLOBAL::g_stSATConfig.szCaseResultDir;
|
|
std::string xmlpath = GLOBAL::g_stSATConfig.szCaseResultDir;
|
|
xmlpath.append("detail\\");
|
|
xmlpath.append("detail\\");
|
|
xmlpath.append(pCase->_strFileName);
|
|
xmlpath.append(pCase->_strFileName);
|
|
|
|
+#if 0
|
|
|
|
+ // 文件名加下PID做为后缀;
|
|
|
|
+ if ( pCase->__dwPythonPID > 0)
|
|
|
|
+ {
|
|
|
|
+ TCHAR szPID[16] = "_";
|
|
|
|
+ _ltoa_s(pCase->__dwPythonPID, &szPID[1], 15, 10);
|
|
|
|
+ xmlpath.append(szPID);
|
|
|
|
+ }
|
|
|
|
+#endif
|
|
xmlpath.append("_result.xml");
|
|
xmlpath.append("_result.xml");
|
|
std::vector<STCaseItem> vtCaseItem;
|
|
std::vector<STCaseItem> vtCaseItem;
|
|
GetCaseXMLResult(xmlpath, vtCaseItem);
|
|
GetCaseXMLResult(xmlpath, vtCaseItem);
|