Skip to content

Commit afb1659

Browse files
committed
fix server log messages and rearrange ut
1 parent d303b8f commit afb1659

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,13 @@ func Serve(opts *ServeConfig) {
304304

305305
certPEM, keyPEM, err := generateCert()
306306
if err != nil {
307-
logger.Error("failed to generate client certificate", "error", err)
307+
logger.Error("failed to generate server certificate", "error", err)
308308
panic(err)
309309
}
310310

311311
cert, err := tls.X509KeyPair(certPEM, keyPEM)
312312
if err != nil {
313-
logger.Error("failed to parse client certificate", "error", err)
313+
logger.Error("failed to parse server certificate", "error", err)
314314
panic(err)
315315
}
316316

server_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ func TestServer_testMode_AutoMTLS(t *testing.T) {
117117
t.Fatalf("err: %s", err)
118118
}
119119

120+
// Pinging should work
121+
if err := client.Ping(); err != nil {
122+
t.Fatalf("should not err: %s", err)
123+
}
124+
120125
// Grab the impl
121126
raw, err := client.Dispense("test")
122127
if err != nil {
@@ -140,11 +145,6 @@ func TestServer_testMode_AutoMTLS(t *testing.T) {
140145
t.Fatal("invalid response", err)
141146
}
142147

143-
// Pinging should work
144-
if err := client.Ping(); err != nil {
145-
t.Fatalf("should not err: %s", err)
146-
}
147-
148148
c.Kill()
149149
// Canceling should cause an exit
150150
cancel()

0 commit comments

Comments
 (0)