* Fix the error when the execution node executes ta case.

This commit is contained in:
liyang
2024-05-22 10:57:15 +08:00
parent dda86615da
commit d2bc1683b1
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -1431,7 +1431,7 @@ class testtaskModel extends model
foreach($results as $resultID => $result)
{
$result->stepResults = unserialize($result->stepResults);
$result->stepResults = $result->stepResults ? unserialize($result->stepResults) : array();
$result->build = !empty($runs[$result->run]->build) ? $runs[$result->run]->build : 0;
$result->task = !empty($runs[$result->run]->task) ? $runs[$result->run]->task : 0;
$result->nodeName = zget($nodes, $result->node, '');
+3 -2
View File
@@ -719,9 +719,9 @@ class zanodemodel extends model
* @param int $caseID
* @param int $testtaskID
* @access public
* @return string
* @return string|object
*/
public function runZTFScript(int $scriptID = 0, int $caseID = 0, int $testtaskID = 0): string
public function runZTFScript(int $scriptID = 0, int $caseID = 0, int $testtaskID = 0): string|object
{
$automation = $this->getAutomationByID($scriptID);
$node = $this->getNodeByID($automation->node);
@@ -744,6 +744,7 @@ class zanodemodel extends model
$this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($testtaskID)->exec();
return dao::$errors = $this->lang->zanode->runTimeout;
}
return $result;
}
/**