fix(cdsctl): workflow status command (#4954)

ovh · Feb 4, 2020 · 6972662 · 6972662
1 parent f13ff37
commit 6972662
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/cli/cdsctl/workflow.go b/cli/cdsctl/workflow.go
@@ -56,7 +56,7 @@ func workflowNodeForCurrentRepo(projectKey, workflowName string) (int64, error)
 		},
 		{
 			Name:  "git.hash",
-			Value: latestCommit.Hash,
+			Value: latestCommit.LongHash,
 		},
 	}
 

diff --git a/cli/cdsctl/workflow_status.go b/cli/cdsctl/workflow_status.go
@@ -55,7 +55,7 @@ func workflowStatusRunWithTrack(v cli.Values) (interface{}, error) {
 		return nil, fmt.Errorf("unable to get latest commit: %v", err)
 	}
 
-	currentDisplay.Printf("Looking for %s...\n", cli.Magenta(latestCommit.Hash))
+	currentDisplay.Printf("Looking for %s...\n", cli.Magenta(latestCommit.LongHash))
 	currentDisplay.Do(context.Background())
 
 	for runNumber == 0 {

diff --git a/engine/worker/internal/action/builtin_coverage_test.go b/engine/worker/internal/action/builtin_coverage_test.go
@@ -49,6 +49,7 @@ func TestRunCoverage_Absolute(t *testing.T) {
 
 	wk, ctx := SetupTest(t)
 	assert.NoError(t, ioutil.WriteFile("results.xml", []byte(cobertura_result), os.ModePerm))
+	defer os.RemoveAll("results.xml")
 
 	fi, err := os.Open("results.xml")
 	require.NoError(t, err)
@@ -161,6 +162,7 @@ func TestRunCoverageMinimumFail(t *testing.T) {
 
 	wk, ctx := SetupTest(t)
 	assert.NoError(t, ioutil.WriteFile("results.xml", []byte(cobertura_result), os.ModePerm))
+	defer os.RemoveAll("results.xml")
 
 	fi, err := os.Open("results.xml")
 	require.NoError(t, err)

diff --git a/engine/worker/internal/action/builtin_junit_test.go b/engine/worker/internal/action/builtin_junit_test.go
@@ -44,6 +44,7 @@ func TestRunParseJunitTestResultAction_Absolute(t *testing.T) {
 
 	wk, ctx := SetupTest(t)
 	assert.NoError(t, ioutil.WriteFile("results.xml", []byte(fileContent), os.ModePerm))
+	defer os.RemoveAll("results.xml")
 
 	fi, err := os.Open("results.xml")
 	require.NoError(t, err)

diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	github.com/fortytw2/leaktest v1.2.0 // indirect
 	github.com/frankban/quicktest v1.6.0 // indirect
 	github.com/fsamin/go-dump v1.0.9
-	github.com/fsamin/go-repo v0.1.4
+	github.com/fsamin/go-repo v0.1.5
 	github.com/fsamin/go-shredder v0.0.0-20180118184739-b2488aedb5be
 	github.com/gambol99/go-marathon v0.0.0-20170922093320-ec4a50170df7
 	github.com/garyburd/redigo v1.6.0 // indirect

diff --git a/go.sum b/go.sum
@@ -142,6 +142,8 @@ github.com/fsamin/go-dump v1.0.9 h1:3MAneAJLnGfKTJtFEAdgrD+QqqK2Hwj7EJUQMQZcDls=
 github.com/fsamin/go-dump v1.0.9/go.mod h1:ZgKd2aOXAFFbbFuUgvQhu7mwTlI3d3qnTICMWdvAa9o=
 github.com/fsamin/go-repo v0.1.4 h1:P70wyLGKAHeaVDuxHckc1mCM1tsqDsTNGrF/tu1+Z1s=
 github.com/fsamin/go-repo v0.1.4/go.mod h1:V7Te54EYyamyQIp6UKfONBbXBlPF4u3C1bvcH7OtdLM=
+github.com/fsamin/go-repo v0.1.5 h1:YON5aisDn+0DpJlXvqrPT9/EGv13JgYL3X/3GXRlLhY=
+github.com/fsamin/go-repo v0.1.5/go.mod h1:V7Te54EYyamyQIp6UKfONBbXBlPF4u3C1bvcH7OtdLM=
 github.com/fsamin/go-shredder v0.0.0-20180118184739-b2488aedb5be h1:UhjSvwE1gxUYfekK9BXZ/LL55we9Avg+2Pt0PIlMYCk=
 github.com/fsamin/go-shredder v0.0.0-20180118184739-b2488aedb5be/go.mod h1:kuiNcf1lKxl4isIY6bHxbBatpLD43c2RKWIV/AGlhXY=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=