labels use absolute paths

ndeloof · ndeloof · commit ff0864237c74 · 2021-06-11T09:45:17.000+02:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/local/compose/kill_test.go b/local/compose/kill_test.go
@@ -18,6 +18,7 @@ package compose
 
 import (
 	"context"
+	"path/filepath"
 	"testing"
 
 	"github.com/docker/docker/api/types/filters"
@@ -83,7 +84,9 @@ func testContainer(service string, id string) apitypes.Container {
 }
 
 func containerLabels(service string) map[string]string {
-	return map[string]string{serviceLabel: service, configFilesLabel: "docker-compose.yml", workingDirLabel: "testdata", projectLabel: testProject}
+	workingdir, _ := filepath.Abs("testdata")
+	composefile := filepath.Join(workingdir, "docker-compose.yml")
+	return map[string]string{serviceLabel: service, configFilesLabel: composefile, workingDirLabel: workingdir, projectLabel: testProject}
 }
 
 func anyCancellableContext() gomock.Matcher {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package compose`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "path/filepath"`
`21`	`22`	`"testing"`
`22`	`23`
`23`	`24`	`"github.com/docker/docker/api/types/filters"`
`@@ -83,7 +84,9 @@ func testContainer(service string, id string) apitypes.Container {`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`func containerLabels(service string) map[string]string {`
`86`		`- return map[string]string{serviceLabel: service, configFilesLabel: "docker-compose.yml", workingDirLabel: "testdata", projectLabel: testProject}`
	`87`	`+ workingdir, _ := filepath.Abs("testdata")`
	`88`	`+ composefile := filepath.Join(workingdir, "docker-compose.yml")`
	`89`	`+ return map[string]string{serviceLabel: service, configFilesLabel: composefile, workingDirLabel: workingdir, projectLabel: testProject}`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`func anyCancellableContext() gomock.Matcher {`