fix load config and zip results issues for unittest

Makefile

-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}/

internal/command/action/ztfResult.go

@@ -56,6 +56,5 @@ func CommitZTFTestResult(files []string, productId int, taskIdOrName string, noN
 	}
 
 	config := configHelper.LoadByWorkspacePath(commConsts.ZtfDir)
-
 	err = zentaoHelper.CommitResult(report, result.ProductId, result.TaskId, config, nil)
 }

internal/pkg/helper/exec/report-unit.go

@@ -33,8 +33,8 @@ func GenUnitTestReport(req serverDomain.TestSet, startTime, endTime int64,
 	key := stringUtils.Md5(req.WorkspacePath)
 
 	testSuites, zipDir := RetrieveUnitResult(req.WorkspacePath, startTime, req.TestTool, req.BuildTool)
-	unitResultPath := filepath.Join(commConsts.ExecLogDir, commConsts.ResultZip)
-	fileUtils.ZipDir(unitResultPath, zipDir)
+	zipFile := filepath.Join(commConsts.ExecLogDir, commConsts.ResultZip)
+	fileUtils.ZipDir(zipFile, zipDir)
 
 	cases, classNameMaxWidth, duration := ParserUnitTestResult(testSuites)
 
@@ -196,7 +196,7 @@ func RetrieveUnitResult(workspacePath string, startTime int64, testTool commCons
 		resultDir = "results"
 		zipDir = resultDir
 	} else {
-		resultDir = ""
+		resultDir = "testresult.xml"
 		zipDir = resultDir
 	}
 

internal/pkg/helper/exec/unit.go

@@ -55,7 +55,12 @@ func ExecUnit(ch chan int,
 
 	// submit result
 	if req.SubmitResult {
-		config := configHelper.LoadByWorkspacePath(req.WorkspacePath)
+		configDir := req.WorkspacePath
+		if commConsts.ExecFrom == commConsts.FromCmd {
+			configDir = commConsts.ZtfDir
+		}
+
+		config := configHelper.LoadByWorkspacePath(configDir)
 		err = zentaoHelper.CommitResult(report, req.ProductId, 0, config, wsMsg)
 	}