From 2517c27482574c73d4f9cd3b0e81131151df4204 Mon Sep 17 00:00:00 2001 From: aaron <462826@qq.com> Date: Thu, 30 Jun 2022 17:10:33 +0800 Subject: [PATCH] fix unit test issues --- Makefile | 2 +- cmd/command/main.go | 2 ++ internal/pkg/helper/exec/report-unit.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 02e80d2a..85add9d8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=3.0.0 +VERSION=3.0.0_beta1 PROJECT=ztf QINIU_DIR=/Users/aaron/work/zentao/qiniu/ QINIU_DIST_DIR=${QINIU_DIR}${PROJECT}/${VERSION}/ diff --git a/cmd/command/main.go b/cmd/command/main.go index 4b9f1a3e..bee77e34 100644 --- a/cmd/command/main.go +++ b/cmd/command/main.go @@ -230,6 +230,8 @@ func runUnitTest(args []string) { } else if args[start] == commConsts.UnitTestToolRobot { commConsts.UnitTestTool = commConsts.RobotFramework commConsts.UnitBuildTool = commConsts.Maven + } else { + commConsts.UnitTestTool = commConsts.TestTool(args[start]) } cmd := strings.Join(args[start:], " ") diff --git a/internal/pkg/helper/exec/report-unit.go b/internal/pkg/helper/exec/report-unit.go index fb3e56b0..cbda9993 100644 --- a/internal/pkg/helper/exec/report-unit.go +++ b/internal/pkg/helper/exec/report-unit.go @@ -194,7 +194,7 @@ func RetrieveUnitResult(workspacePath string, startTime int64, testTool commCons resultDir = "results" zipDir = resultDir } else { - resultDir = "results" + resultDir = "" zipDir = resultDir } -- GitLab