Skip to content

Commit c338ddb

Browse files
raphaelraphael
committed
Fix tests
1 parent 42cb425 commit c338ddb

13 files changed

+64
-64
lines changed

‎codegen/example/testdata/server-no-server.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func main() {
6464
addr := "http://localhost:80"
6565
u, err := url.Parse(addr)
6666
if err != nil {
67-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
67+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6868
}
6969
if *secureF {
7070
u.Scheme = "https"
@@ -75,7 +75,7 @@ func main() {
7575
if *httpPortF != "" {
7676
h, _, err := net.SplitHostPort(u.Host)
7777
if err != nil {
78-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
78+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7979
}
8080
u.Host = net.JoinHostPort(h, *httpPortF)
8181
} else if u.Port() == "" {
@@ -88,7 +88,7 @@ func main() {
8888
addr := "grpc://localhost:8080"
8989
u, err := url.Parse(addr)
9090
if err != nil {
91-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
91+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9292
}
9393
if *secureF {
9494
u.Scheme = "grpcs"
@@ -99,7 +99,7 @@ func main() {
9999
if *grpcPortF != "" {
100100
h, _, err := net.SplitHostPort(u.Host)
101101
if err != nil {
102-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
102+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
103103
}
104104
u.Host = net.JoinHostPort(h, *grpcPortF)
105105
} else if u.Port() == "" {
@@ -109,7 +109,7 @@ func main() {
109109
}
110110

111111
default:
112-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
112+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
113113
}
114114

115115
// Wait for signal.

‎codegen/example/testdata/server-same-api-service-name.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func main() {
6464
addr := "http://localhost:80"
6565
u, err := url.Parse(addr)
6666
if err != nil {
67-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
67+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6868
}
6969
if *secureF {
7070
u.Scheme = "https"
@@ -75,7 +75,7 @@ func main() {
7575
if *httpPortF != "" {
7676
h, _, err := net.SplitHostPort(u.Host)
7777
if err != nil {
78-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
78+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7979
}
8080
u.Host = net.JoinHostPort(h, *httpPortF)
8181
} else if u.Port() == "" {
@@ -88,7 +88,7 @@ func main() {
8888
addr := "grpc://localhost:8080"
8989
u, err := url.Parse(addr)
9090
if err != nil {
91-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
91+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9292
}
9393
if *secureF {
9494
u.Scheme = "grpcs"
@@ -99,7 +99,7 @@ func main() {
9999
if *grpcPortF != "" {
100100
h, _, err := net.SplitHostPort(u.Host)
101101
if err != nil {
102-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
102+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
103103
}
104104
u.Host = net.JoinHostPort(h, *grpcPortF)
105105
} else if u.Port() == "" {
@@ -109,7 +109,7 @@ func main() {
109109
}
110110

111111
default:
112-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
112+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
113113
}
114114

115115
// Wait for signal.

‎codegen/example/testdata/server-sercice-for-only-grpc.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func main() {
6464
addr := "grpc://localhost:8080"
6565
u, err := url.Parse(addr)
6666
if err != nil {
67-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
67+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6868
}
6969
if *secureF {
7070
u.Scheme = "grpcs"
@@ -75,7 +75,7 @@ func main() {
7575
if *grpcPortF != "" {
7676
h, _, err := net.SplitHostPort(u.Host)
7777
if err != nil {
78-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
78+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7979
}
8080
u.Host = net.JoinHostPort(h, *grpcPortF)
8181
} else if u.Port() == "" {
@@ -85,7 +85,7 @@ func main() {
8585
}
8686

8787
default:
88-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
88+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
8989
}
9090

9191
// Wait for signal.

‎codegen/example/testdata/server-server-hosting-multiple-services.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func main() {
7070
addr := "http://example:8090"
7171
u, err := url.Parse(addr)
7272
if err != nil {
73-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
73+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
7474
}
7575
if *secureF {
7676
u.Scheme = "https"
@@ -81,7 +81,7 @@ func main() {
8181
if *httpPortF != "" {
8282
h, _, err := net.SplitHostPort(u.Host)
8383
if err != nil {
84-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
84+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
8585
}
8686
u.Host = net.JoinHostPort(h, *httpPortF)
8787
} else if u.Port() == "" {
@@ -94,7 +94,7 @@ func main() {
9494
addr := "grpc://localhost:8080"
9595
u, err := url.Parse(addr)
9696
if err != nil {
97-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
97+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9898
}
9999
if *secureF {
100100
u.Scheme = "grpcs"
@@ -105,7 +105,7 @@ func main() {
105105
if *grpcPortF != "" {
106106
h, _, err := net.SplitHostPort(u.Host)
107107
if err != nil {
108-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
108+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
109109
}
110110
u.Host = net.JoinHostPort(h, *grpcPortF)
111111
} else if u.Port() == "" {
@@ -115,7 +115,7 @@ func main() {
115115
}
116116

117117
default:
118-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev)\n", *hostF)
118+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev)\n", *hostF))
119119
}
120120

121121
// Wait for signal.

‎codegen/example/testdata/server-server-hosting-service-subset.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func main() {
6464
addr := "http://example:8090"
6565
u, err := url.Parse(addr)
6666
if err != nil {
67-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
67+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6868
}
6969
if *secureF {
7070
u.Scheme = "https"
@@ -75,7 +75,7 @@ func main() {
7575
if *httpPortF != "" {
7676
h, _, err := net.SplitHostPort(u.Host)
7777
if err != nil {
78-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
78+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7979
}
8080
u.Host = net.JoinHostPort(h, *httpPortF)
8181
} else if u.Port() == "" {
@@ -88,7 +88,7 @@ func main() {
8888
addr := "grpc://localhost:8080"
8989
u, err := url.Parse(addr)
9090
if err != nil {
91-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
91+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9292
}
9393
if *secureF {
9494
u.Scheme = "grpcs"
@@ -99,7 +99,7 @@ func main() {
9999
if *grpcPortF != "" {
100100
h, _, err := net.SplitHostPort(u.Host)
101101
if err != nil {
102-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
102+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
103103
}
104104
u.Host = net.JoinHostPort(h, *grpcPortF)
105105
} else if u.Port() == "" {
@@ -109,7 +109,7 @@ func main() {
109109
}
110110

111111
default:
112-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev)\n", *hostF)
112+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev)\n", *hostF))
113113
}
114114

115115
// Wait for signal.

‎codegen/example/testdata/server-server-hosting-service-with-file-server.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func main() {
4444
addr := "http://localhost:80"
4545
u, err := url.Parse(addr)
4646
if err != nil {
47-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
47+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
4848
}
4949
if *secureF {
5050
u.Scheme = "https"
@@ -55,7 +55,7 @@ func main() {
5555
if *httpPortF != "" {
5656
h, _, err := net.SplitHostPort(u.Host)
5757
if err != nil {
58-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
58+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
5959
}
6060
u.Host = net.JoinHostPort(h, *httpPortF)
6161
} else if u.Port() == "" {
@@ -65,7 +65,7 @@ func main() {
6565
}
6666

6767
default:
68-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: svc)\n", *hostF)
68+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: svc)\n", *hostF))
6969
}
7070

7171
// Wait for signal.

‎codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func main() {
7070
addr := "http://localhost:80"
7171
u, err := url.Parse(addr)
7272
if err != nil {
73-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
73+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
7474
}
7575
if *secureF {
7676
u.Scheme = "https"
@@ -81,7 +81,7 @@ func main() {
8181
if *httpPortF != "" {
8282
h, _, err := net.SplitHostPort(u.Host)
8383
if err != nil {
84-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
84+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
8585
}
8686
u.Host = net.JoinHostPort(h, *httpPortF)
8787
} else if u.Port() == "" {
@@ -94,7 +94,7 @@ func main() {
9494
addr := "grpc://localhost:8080"
9595
u, err := url.Parse(addr)
9696
if err != nil {
97-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
97+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9898
}
9999
if *secureF {
100100
u.Scheme = "grpcs"
@@ -105,7 +105,7 @@ func main() {
105105
if *grpcPortF != "" {
106106
h, _, err := net.SplitHostPort(u.Host)
107107
if err != nil {
108-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
108+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
109109
}
110110
u.Host = net.JoinHostPort(h, *grpcPortF)
111111
} else if u.Port() == "" {
@@ -115,7 +115,7 @@ func main() {
115115
}
116116

117117
default:
118-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
118+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
119119
}
120120

121121
// Wait for signal.

‎codegen/example/testdata/server-service-for-only-http.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func main() {
6363
addr := "http://localhost:80"
6464
u, err := url.Parse(addr)
6565
if err != nil {
66-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
66+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6767
}
6868
if *secureF {
6969
u.Scheme = "https"
@@ -74,7 +74,7 @@ func main() {
7474
if *httpPortF != "" {
7575
h, _, err := net.SplitHostPort(u.Host)
7676
if err != nil {
77-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
77+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7878
}
7979
u.Host = net.JoinHostPort(h, *httpPortF)
8080
} else if u.Port() == "" {
@@ -84,7 +84,7 @@ func main() {
8484
}
8585

8686
default:
87-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
87+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
8888
}
8989

9090
// Wait for signal.

‎codegen/example/testdata/server-service-name-with-spaces.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func main() {
6464
addr := "http://localhost:80"
6565
u, err := url.Parse(addr)
6666
if err != nil {
67-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
67+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
6868
}
6969
if *secureF {
7070
u.Scheme = "https"
@@ -75,7 +75,7 @@ func main() {
7575
if *httpPortF != "" {
7676
h, _, err := net.SplitHostPort(u.Host)
7777
if err != nil {
78-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
78+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
7979
}
8080
u.Host = net.JoinHostPort(h, *httpPortF)
8181
} else if u.Port() == "" {
@@ -88,7 +88,7 @@ func main() {
8888
addr := "grpc://localhost:8080"
8989
u, err := url.Parse(addr)
9090
if err != nil {
91-
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
91+
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
9292
}
9393
if *secureF {
9494
u.Scheme = "grpcs"
@@ -99,7 +99,7 @@ func main() {
9999
if *grpcPortF != "" {
100100
h, _, err := net.SplitHostPort(u.Host)
101101
if err != nil {
102-
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
102+
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
103103
}
104104
u.Host = net.JoinHostPort(h, *grpcPortF)
105105
} else if u.Port() == "" {
@@ -109,7 +109,7 @@ func main() {
109109
}
110110

111111
default:
112-
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: svc)\n", *hostF)
112+
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: svc)\n", *hostF))
113113
}
114114

115115
// Wait for signal.

0 commit comments

Comments
 (0)