Skip to content

Commit 4a49a6d

Browse files
author
Drew O'Meara
committed
CI-friendly golden testing fixes
1 parent e0f7a11 commit 4a49a6d

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

examples/embedding/main_test.go

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,33 @@ package main
22

33
import (
44
"bytes"
5+
"flag"
56
"os"
67
"os/exec"
8+
"path/filepath"
79
"testing"
810
)
911

10-
const embeddingTestOutput = "testdata/embedding_golden.txt"
12+
const embeddingTestOutput = "testdata/embedding_out_golden.txt"
13+
1114
var regen = flag.Bool("regen", false, "regenerate golden files")
1215

1316
func TestEmbeddedExample(t *testing.T) {
1417

1518
tmp, err := os.MkdirTemp("", "go-python-embedding-")
16-
if err != nil { t.Fatal(err) }
19+
if err != nil {
20+
t.Fatal(err)
21+
}
1722
defer os.RemoveAll(tmp)
18-
cmd := exec.Command("go", "build", "-o", filepath.Join(tmp,"exe"), ".")
19-
err := cmd.Run()
23+
24+
cmd := exec.Command("go", "build", "-o", filepath.Join(tmp, "exe"), ".")
25+
err = cmd.Run()
2026
if err != nil {
2127
t.Fatalf("failed to compile embedding example: %v", err)
2228
}
2329

2430
out := new(bytes.Buffer)
25-
cmd = exec.Command(filepath.Join(tmp,"exe"), "mylib-demo.py")
31+
cmd = exec.Command(filepath.Join(tmp, "exe"), "mylib-demo.py")
2632
cmd.Stdout = out
2733

2834
err = cmd.Run()
@@ -31,17 +37,20 @@ func TestEmbeddedExample(t *testing.T) {
3137
}
3238

3339
testOutput := out.Bytes()
40+
41+
flag.Parse()
3442
if *regen {
3543
err = os.WriteFile(embeddingTestOutput, testOutput, 0644)
3644
if err != nil {
3745
t.Fatalf("failed to write test output: %v", err)
3846
}
3947
}
40-
mustMatch, err := os.ReadFile(embeddingTestOutput)
41-
if err != nil {
42-
t.Fatalf("failed read %q", embeddingTestOutput)
43-
}
44-
if !bytes.Equal(testOutput, mustMatch) {
45-
t.Fatalf("embedded test output did not match accepted output from %q", embeddingTestOutput)
46-
}
48+
49+
mustMatch, err := os.ReadFile(embeddingTestOutput)
50+
if err != nil {
51+
t.Fatalf("failed read %q", embeddingTestOutput)
52+
}
53+
if !bytes.Equal(testOutput, mustMatch) {
54+
t.Fatalf("embedded test output did not match accepted output from %q", embeddingTestOutput)
55+
}
4756
}

examples/embedding/embedding-test-output.txt renamed to examples/embedding/testdata/embedding_out_golden.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Spring Break itinerary:
1212
Stop 2: Mallorca, Spain | 3 nights
1313
Stop 3: Ibiza, Spain | 14 nights
1414
Stop 4: Monaco | 12 nights
15-
### Made with Vacaton 1.0 by Fletch F. Fletcher
15+
### Made with Vacation 1.0 by Fletch F. Fletcher
1616

1717
I bet Monaco will be the best!
1818

0 commit comments

Comments
 (0)