diff --git a/src/pkg/cli/loader_test.go b/src/pkg/cli/loader_test.go index b1fbbaac..d63c8004 100644 --- a/src/pkg/cli/loader_test.go +++ b/src/pkg/cli/loader_test.go @@ -1,6 +1,7 @@ package cli import ( + "bytes" "context" "os" "path/filepath" @@ -21,16 +22,21 @@ func TestLoader(t *testing.T) { if err != nil { t.Fatal(err) } - bytes, err := proj.MarshalYAML() + yaml, err := proj.MarshalYAML() if err != nil { t.Fatal(err) } + + // 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("TESTPATH")) + golden, err := os.ReadFile(path + ".golden") if err != nil { - os.WriteFile(path+".golden", bytes, 0644) - } else if string(bytes) != string(golden) { + os.WriteFile(path+".golden", yaml, 0644) + } else if string(yaml) != string(golden) { t.Errorf("Result mismatch, written as %s.mismatch", path) - os.WriteFile(path+".mismatch", bytes, 0644) + os.WriteFile(path+".mismatch", yaml, 0644) } }) return nil diff --git a/src/tests/alttestproj/compose.yaml.golden b/src/tests/alttestproj/compose.yaml.golden index 75fb58fc..abd6eaa3 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: /home/edw/defang/defang/src/tests/alttestproj + context: TESTPATH dockerfile: Dockerfile args: DNS: dfnx diff --git a/src/tests/emptyenv/compose.yaml.golden b/src/tests/emptyenv/compose.yaml.golden index 9065c185..4965ee43 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: /home/edw/defang/defang/src/tests/emptyenv + context: TESTPATH dockerfile: Dockerfile args: ARG2: "" diff --git a/src/tests/secretname/compose.yaml.golden b/src/tests/secretname/compose.yaml.golden index 16e06250..1b89e814 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: /home/edw/defang/defang/src/tests/secretname + context: TESTPATH dockerfile: Dockerfile networks: default: null diff --git a/src/tests/testproj/compose.yaml.golden b/src/tests/testproj/compose.yaml.golden index 1dfd37af..2bcbeb59 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: /home/edw/defang/defang/src/tests/testproj + context: TESTPATH dockerfile: Dockerfile args: DNS: dfnx