From 581c9cb3b4eeef98be674b6609278e91174614cb Mon Sep 17 00:00:00 2001 From: Edward J Date: Tue, 18 Jun 2024 14:51:15 -0700 Subject: [PATCH] Use '.' in the loader test replacing context --- src/pkg/cli/loader_test.go | 2 +- src/tests/alttestproj/compose.yaml.golden | 2 +- src/tests/emptyenv/compose.yaml.golden | 2 +- src/tests/secretname/compose.yaml.golden | 2 +- src/tests/testproj/compose.yaml.golden | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pkg/cli/loader_test.go b/src/pkg/cli/loader_test.go index b0ad2298..6356a0a0 100644 --- a/src/pkg/cli/loader_test.go +++ b/src/pkg/cli/loader_test.go @@ -29,7 +29,7 @@ func TestLoader(t *testing.T) { // Replace the absolute path in context to make the .golden file portable absPath, _ := filepath.Abs(path) - yaml = bytes.ReplaceAll(yaml, []byte(filepath.Dir(absPath)), []byte(path)) + yaml = bytes.ReplaceAll(yaml, []byte(filepath.Dir(absPath)), []byte{'.'}) golden, err := os.ReadFile(path + ".golden") if err != nil { diff --git a/src/tests/alttestproj/compose.yaml.golden b/src/tests/alttestproj/compose.yaml.golden index 1e44edb8..b8d44a93 100644 --- a/src/tests/alttestproj/compose.yaml.golden +++ b/src/tests/alttestproj/compose.yaml.golden @@ -2,7 +2,7 @@ name: tests services: dfnx: build: - context: ../../tests/alttestproj/compose.yaml + context: . dockerfile: Dockerfile args: DNS: dfnx diff --git a/src/tests/emptyenv/compose.yaml.golden b/src/tests/emptyenv/compose.yaml.golden index a5187aa1..becdadcb 100644 --- a/src/tests/emptyenv/compose.yaml.golden +++ b/src/tests/emptyenv/compose.yaml.golden @@ -2,7 +2,7 @@ name: emptyenv services: emptyenv: build: - context: ../../tests/emptyenv/compose.yaml + context: . dockerfile: Dockerfile args: ARG2: "" diff --git a/src/tests/secretname/compose.yaml.golden b/src/tests/secretname/compose.yaml.golden index b73fe32e..d81dcb38 100644 --- a/src/tests/secretname/compose.yaml.golden +++ b/src/tests/secretname/compose.yaml.golden @@ -2,7 +2,7 @@ name: secretname services: app: build: - context: ../../tests/secretname/compose.yaml + context: . dockerfile: Dockerfile networks: default: null diff --git a/src/tests/testproj/compose.yaml.golden b/src/tests/testproj/compose.yaml.golden index f52de3ab..0a5876c8 100644 --- a/src/tests/testproj/compose.yaml.golden +++ b/src/tests/testproj/compose.yaml.golden @@ -2,7 +2,7 @@ name: tests services: dfnx: build: - context: ../../tests/testproj/compose.yaml + context: . dockerfile: Dockerfile args: DNS: dfnx