* Adjust code for testtask batchRun.

This commit is contained in:
tanghucheng
2022-12-15 23:01:12 +08:00
parent fabfcb34e4
commit 772c31f7f9
10 changed files with 106 additions and 24 deletions
+1 -8
View File
@@ -1351,15 +1351,8 @@ class testtaskModel extends model
$result->stepResults = serialize($stepResults);
$result->lastRunner = $this->app->user->account;
$result->date = $now;
if(isset($postData->node)) $result->node = $postData->node;
$this->dao->insert(TABLE_TESTRESULT)->data($result)->autoCheck()->exec();
if(!dao::isError() and isset($postData->node))
{
$resultID = $this->dao->lastInsertID();
$this->loadModel('zanode')->runZTFScript($postData->automation, $caseID, $resultID);
}
$this->dao->update(TABLE_CASE)->set('lastRunner')->eq($this->app->user->account)->set('lastRunDate')->eq($now)->set('lastRunResult')->eq($caseResult)->where('id')->eq($caseID)->exec();
if($runID)
@@ -1479,7 +1472,7 @@ class testtaskModel extends model
}
/* Get files of step result. */
foreach($result->stepResults as $stepID => $stepResult) $result->stepResults[$stepID]['files'] = isset($stepFiles[$resultID][$stepID]) ? $stepFiles[$resultID][$stepID] : array();
if(!empty($result->stepResults)) foreach($result->stepResults as $stepID => $stepResult) $result->stepResults[$stepID]['files'] = isset($stepFiles[$resultID][$stepID]) ? $stepFiles[$resultID][$stepID] : array();
}
return $results;
}