From d2bc1683b192661c692c481d986ee1cf90831aa2 Mon Sep 17 00:00:00 2001 From: liyang Date: Wed, 22 May 2024 10:57:11 +0800 Subject: [PATCH] * Fix the error when the execution node executes ta case. --- module/testtask/model.php | 2 +- module/zanode/model.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 419e81ac3b..03f454844c 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -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, ''); diff --git a/module/zanode/model.php b/module/zanode/model.php index 0857a432bb..47a2887495 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -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; } /**