Skip to content

Commit 06d7cd0

Browse files
aledbfclaude
andcommitted
test(cli): read the TLS server's container id from stdout alone
docker run's stderr carries the image pull's progress when the base image is not cached, as on CI; combined with stdout it became part of the container id, and every later docker call on that id failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 9e909a2 commit 06d7cd0

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

‎internal/cli/e2e_ca_bundle_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@ func startTLSServer(t *testing.T, ca *testCA) (id, url string) {
3434
if err := os.Chmod(certs, 0o755); err != nil {
3535
t.Fatal(err)
3636
}
37-
out, err := exec.Command("docker", "run", "-d", "-v", certs+":/certs:ro", e2eBaseImage, "sh", "-c",
38-
"while [ ! -f /certs/ready ]; do sleep 0.1; done; exec openssl s_server -quiet -www -accept 8443 -cert /certs/cert.pem -key /certs/key.pem").CombinedOutput()
37+
run := exec.Command("docker", "run", "-d", "-v", certs+":/certs:ro", e2eBaseImage, "sh", "-c",
38+
"while [ ! -f /certs/ready ]; do sleep 0.1; done; exec openssl s_server -quiet -www -accept 8443 -cert /certs/cert.pem -key /certs/key.pem")
39+
var runErr bytes.Buffer
40+
run.Stderr = &runErr
41+
out, err := run.Output()
3942
if err != nil {
40-
t.Fatalf("start TLS server: %v\n%s", err, out)
43+
t.Fatalf("start TLS server: %v\n%s%s", err, out, runErr.Bytes())
4144
}
4245
id = strings.TrimSpace(string(out))
4346
t.Cleanup(func() { removeByID(id) })

0 commit comments

Comments
 (0)