diff --git a/internal/pkg/helper/exec/unit.go b/internal/pkg/helper/exec/unit.go index 6f2162367c2d010be82208b13ca741247e8ea200..ba826de24d217bcab8bcd5084d30e8cd8943ad7e 100644 --- a/internal/pkg/helper/exec/unit.go +++ b/internal/pkg/helper/exec/unit.go @@ -3,7 +3,6 @@ package execHelper import ( "bufio" "errors" - "fmt" "io" "os/exec" "path/filepath" @@ -11,7 +10,6 @@ import ( "time" fileUtils "github.com/easysoft/zentaoatf/pkg/lib/file" - "github.com/gofrs/uuid" commConsts "github.com/easysoft/zentaoatf/internal/pkg/consts" configHelper "github.com/easysoft/zentaoatf/internal/pkg/helper/config" @@ -93,12 +91,11 @@ func ExecUnit(ch chan int, func RunUnitTest(ch chan int, cmdStr, workspacePath string, wsMsg *websocket.Message) (err error) { key := stringUtils.Md5(workspacePath) - uuidString := uuid.Must(uuid.NewV4()).String() var cmd *exec.Cmd if commonUtils.IsWin() { - cmd = exec.Command("cmd", "/C", cmdStr, "-uuid", uuidString) + cmd = exec.Command("cmd", "/C", cmdStr) } else { - cmd = exec.Command("/bin/bash", "-c", fmt.Sprintf("%s -uuid %s", cmdStr, uuidString)) + cmd = exec.Command("/bin/bash", "-c", cmdStr) } cmd.Dir = workspacePath @@ -138,22 +135,6 @@ func RunUnitTest(ch chan int, cmdStr, workspacePath string, wsMsg *websocket.Mes } cmd.Start() - go func() { - for { - select { - case _, ok := <-ch: - KillProcessByUUID(uuidString) - stdout.Close() - stderr.Close() - SetRunning(false) - if ok { - close(ch) - } - return - default: - } - } - }() isTerminal := false reader1 := bufio.NewReader(stdout) @@ -175,6 +156,7 @@ func RunUnitTest(ch chan int, cmdStr, workspacePath string, wsMsg *websocket.Mes select { case <-ch: + cmd.Process.Kill() msg := i118Utils.Sprintf("exit_exec_curr") if commConsts.ExecFrom != commConsts.FromCmd { diff --git a/ui/src/views/exec/LogList.vue b/ui/src/views/exec/LogList.vue index 78443ceec57ec0e7e1c18520ea78e3989a26adac..24cb0035bd7f1f80e38ffbc6a442796b4cd80d71 100644 --- a/ui/src/views/exec/LogList.vue +++ b/ui/src/views/exec/LogList.vue @@ -296,7 +296,7 @@ const exec = async (data: any) => { const checkProxyStatus = async (workspaceId, msg) => { if(msg.testSets == undefined){ - return {path: ''}; + return {path: 'local'}; } currentWorkspace.value = {}; let workspaceInfo = {} as any; diff --git a/ui/src/views/proxy/ProxyNav.vue b/ui/src/views/proxy/ProxyNav.vue index e85560b2d23eb8ea84e28b519e5ebc9bffd52e2b..569265b824cad0e3cef4047551010d5742849f69 100644 --- a/ui/src/views/proxy/ProxyNav.vue +++ b/ui/src/views/proxy/ProxyNav.vue @@ -1,11 +1,11 @@