Skip to content

Commit ccb0967

Browse files
rustatianrustatian
committed
chore(tests): drive RPC over goridge net/rpc again
Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
1 parent 9426220 commit ccb0967

4 files changed

Lines changed: 47 additions & 61 deletions

File tree

‎tests/go.mod‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,31 @@ go 1.26
55
toolchain go1.26.4
66

77
require (
8-
connectrpc.com/connect v1.20.0
98
github.com/Shopify/toxiproxy/v2 v2.12.0
109
github.com/beanstalkd/go-beanstalk v0.2.0
1110
github.com/google/uuid v1.6.0
12-
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12
11+
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12.0.20260714200341-93604e5012d4
1312
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2
1413
github.com/roadrunner-server/beanstalk/v6 v6.0.0
1514
github.com/roadrunner-server/config/v6 v6.0.0-beta.3
1615
github.com/roadrunner-server/endure/v2 v2.6.2
17-
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2
18-
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7
16+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2.0.20260714195909-75e9ece43063
17+
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2.0.20260714201850-2854c943433a
18+
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7.0.20260714202317-a904df360b84
1919
github.com/roadrunner-server/logger/v6 v6.0.0-beta.3
20-
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3
21-
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4
20+
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3.0.20260714201533-91a174bb65d4
21+
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4.0.20260714200548-15b82bc47898
2222
github.com/roadrunner-server/server/v6 v6.0.0-beta.6
2323
github.com/stretchr/testify v1.11.1
2424
go.opentelemetry.io/otel/sdk v1.44.0
2525
go.opentelemetry.io/otel/trace v1.44.0
26-
golang.org/x/net v0.56.0
2726
google.golang.org/genproto v0.0.0-20260630182238-925bb5da69e7
2827
google.golang.org/protobuf v1.36.11
2928
)
3029

3130
replace github.com/roadrunner-server/beanstalk/v6 => ../
3231

3332
require (
34-
connectrpc.com/grpcreflect v1.3.0 // indirect
3533
github.com/beorn7/perks v1.0.1 // indirect
3634
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3735
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -54,7 +52,6 @@ require (
5452
github.com/prometheus/procfs v0.21.1 // indirect
5553
github.com/roadrunner-server/errors v1.5.0 // indirect
5654
github.com/roadrunner-server/events v1.0.1 // indirect
57-
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2 // indirect
5855
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1 // indirect
5956
github.com/roadrunner-server/priority_queue v1.0.6 // indirect
6057
github.com/roadrunner-server/tcplisten v1.5.2 // indirect
@@ -78,7 +75,5 @@ require (
7875
golang.org/x/sync v0.21.0 // indirect
7976
golang.org/x/sys v0.46.0 // indirect
8077
golang.org/x/text v0.38.0 // indirect
81-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260630182238-925bb5da69e7 // indirect
82-
google.golang.org/grpc v1.82.0 // indirect
8378
gopkg.in/yaml.v3 v3.0.1 // indirect
8479
)

‎tests/go.sum‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ=
2-
connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4=
3-
connectrpc.com/grpcreflect v1.3.0 h1:Y4V+ACf8/vOb1XOc251Qun7jMB75gCUNw6llvB9csXc=
4-
connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JIovCtDYs=
51
github.com/Shopify/toxiproxy/v2 v2.12.0 h1:d1x++lYZg/zijXPPcv7PH0MvHMzEI5aX/YuUi/Sw+yg=
62
github.com/Shopify/toxiproxy/v2 v2.12.0/go.mod h1:R9Z38Pw6k2cGZWXHe7tbxjGW9azmY1KbDQJ1kd+h7Tk=
73
github.com/beanstalkd/go-beanstalk v0.2.0 h1:6UOJugnu47uNB2jJO/lxyDgeD1Yds7owYi1USELqexA=
@@ -30,8 +26,6 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
3026
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
3127
github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
3228
github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
33-
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
34-
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
3529
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
3630
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
3731
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -60,8 +54,8 @@ github.com/prometheus/common v0.69.0 h1:OA85nJQS/T/MaYh/Q2CcgDKSGWqNIgrBDvDH85Cu
6054
github.com/prometheus/common v0.69.0/go.mod h1:ZzL3f6u94qUxh9p+tJTrF+FvBS1XXbbRAZCQkytAL0Y=
6155
github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
6256
github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
63-
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12 h1:FcRcCvW9OfQvH45SFsI21VoHpOOov56OvOSnO4UKvXs=
64-
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12/go.mod h1:prGWJ2GoF5YD5PIG7Tb6VKulU3bWoFwr9DCwgxheb80=
57+
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12.0.20260714200341-93604e5012d4 h1:G5RlEP+rKKdarSw/ZcpWlpyrCne1AbuSZB8p9TagU3I=
58+
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.12.0.20260714200341-93604e5012d4/go.mod h1:Y4rsabWjr4Y10Jg6H8J5NDitQqlnXmGhCdgR+zyLYkI=
6559
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2 h1:GqsZzWQ5jMXRF1O/b8IqFz9PLpS7Ui0K4OyACLql2MI=
6660
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2/go.mod h1:2v4yUK5Kvbvq8C3IkDoBkuamq9h+7i/JLjyf7k1j5JM=
6761
github.com/roadrunner-server/config/v6 v6.0.0-beta.3 h1:G0EUzJ6Yw4UnleM6BhnOBbYPXKDHRmCJiGhC3nXDBwI=
@@ -72,22 +66,22 @@ github.com/roadrunner-server/errors v1.5.0 h1:unG7LKIZrSzkCCF3YLRLA5VyqE0KKomofX
7266
github.com/roadrunner-server/errors v1.5.0/go.mod h1:g9fo/T2C13cWRDR9PW1r0ZAOSQfNhWAZawyfkGiaHuI=
7367
github.com/roadrunner-server/events v1.0.1 h1:waCkKhxhzdK3VcI1xG22l+h+0J+Nfdpxjhyy01Un+kI=
7468
github.com/roadrunner-server/events v1.0.1/go.mod h1:WZRqoEVaFm209t52EuoT7ISUtvX6BrCi6bI/7pjkVC0=
75-
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2 h1:MgH6oiSgcl+vphsQ6JpyedkXQ/DPf8zVpn0z7rdBp10=
76-
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2/go.mod h1:Wv9CBO9VIU92e5iZIuehLHKakXgMkOzxoT4/oHDjIUA=
77-
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2 h1:tJsNgbQ28mK5CdQCpU+BY6ScWP884nhpGYfwJalZOlU=
78-
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2/go.mod h1:nDn5jjR1ZI1Xhz01j32bSs4PHv78IE96rcqdFr/ZvgU=
79-
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7 h1:RNb8fkVk2GO02E3FFyCmYz6WFkeXrBfV/daK84WXAD0=
80-
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7/go.mod h1:kHTJXgjMe/7t9vJN4imEO3RlB7crnnp59X8TmgiEOqw=
69+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2.0.20260714195909-75e9ece43063 h1:0mNGmXgYR2/hUhPQde+GJFzj/UQ6vqrLAHcwa5C5rqA=
70+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.2.0.20260714195909-75e9ece43063/go.mod h1:1aHppV68y/VqRED/AsfNg59sft9aQOhqgr5Z5n49jbM=
71+
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2.0.20260714201850-2854c943433a h1:AiM0l5YReltbsn+/LIS4MAfTD+XWSnijeIlffLh9q58=
72+
github.com/roadrunner-server/informer/v6 v6.0.0-beta.2.0.20260714201850-2854c943433a/go.mod h1:uQGHMxNdwu85+i27kDMGTCVWsvBqQIZhTSGakFMSYu8=
73+
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7.0.20260714202317-a904df360b84 h1:FW3BxRdj3Sz5aYQ/joDQWTb66KQqyqyu8mbrltX0s4k=
74+
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.7.0.20260714202317-a904df360b84/go.mod h1:MidnjQZiP9m3LfLJKtUlXZ75cU+xHuOpLap89jjnPIo=
8175
github.com/roadrunner-server/logger/v6 v6.0.0-beta.3 h1:eoJKXAUSyykDfVX6eTUhmAn6Y8pS/LyI5fDP4H+G5rQ=
8276
github.com/roadrunner-server/logger/v6 v6.0.0-beta.3/go.mod h1:MwHb3AbltHYtu7nRpml5NeYu7O+W8rCpDBeNTTEoE1M=
8377
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1 h1:jpYXFtdD6QGAdAGPgMxrNi3j1CegCRpb2y+A+3GnXFA=
8478
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1/go.mod h1:Bo1wT7RtL3eyQHXBUohNhtj/yAmRt6Rq8smuBg5pWkY=
8579
github.com/roadrunner-server/priority_queue v1.0.6 h1:x8bcMyjWs2Z4ySbO9BTP8Dzy2prCuazJY9HHrVTmUVY=
8680
github.com/roadrunner-server/priority_queue v1.0.6/go.mod h1:aJ2D9s18+OGpFfNgwoIduraaFYBGv4FKElnpzqO+TBI=
87-
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3 h1:+hkbf/kXpvFjx4LfkuH8dvR07rBwrStmcqJaffsfL0g=
88-
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3/go.mod h1:zV+MfVo6jtvrop+04HNcr4z3b/22qyKXukK29kzagYc=
89-
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4 h1:Qj2nrHIWOHE9Tys+FBG2IdoPtzgIUh6juQ5wXLGGDMw=
90-
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4/go.mod h1:k5KT3fpnJVd27m0HbGGBiTPXlWI6eJdd6C+ohp5IE0U=
81+
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3.0.20260714201533-91a174bb65d4 h1:CTtuTFi2YYCkQx/Tu3ANfCPAkgle4AI6RGue70/Vb10=
82+
github.com/roadrunner-server/resetter/v6 v6.0.0-beta.3.0.20260714201533-91a174bb65d4/go.mod h1:74CsBUTfnP9QhUpsUg2XqgurxCQYhxtPikk1C1iEfRc=
83+
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4.0.20260714200548-15b82bc47898 h1:nc1MwAAG02mwOm76TO7sZZLt6ToKlkIz98shqAsxGoA=
84+
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.4.0.20260714200548-15b82bc47898/go.mod h1:pC636ll86dk1PJ2LoYbvurKMUARbF8Ckn4WBGvPXO8A=
9185
github.com/roadrunner-server/server/v6 v6.0.0-beta.6 h1:CPtH4eIYkeRKi5cPXxb0+J+LI824cqhIGXAfcH+nkjA=
9286
github.com/roadrunner-server/server/v6 v6.0.0-beta.6/go.mod h1:SbODuCzC2gcbFhAmJDWvjf34pPrUWP5NxxVsTRQDuZ4=
9387
github.com/roadrunner-server/tcplisten v1.5.2 h1:nn8yXYrhRDkfQ9AAu4V075uT4fZRmOnpxkawgE+bWPA=
@@ -140,8 +134,6 @@ go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
140134
go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
141135
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
142136
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
143-
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
144-
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
145137
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
146138
golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
147139
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -150,14 +142,8 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
150142
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
151143
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
152144
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
153-
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
154-
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
155145
google.golang.org/genproto v0.0.0-20260630182238-925bb5da69e7 h1:lQG76ePMKmtujel4VIVMiFoHVWVNtJdawbCZJtWlVXU=
156146
google.golang.org/genproto v0.0.0-20260630182238-925bb5da69e7/go.mod h1:LwlOWYBU335L+sR55UuR5fbbU8KmEX+3tUHf3SwMmhM=
157-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260630182238-925bb5da69e7 h1:eM/YSd5bBFagF51o1E745Ta7RwzpW0h+z+QDNZOgmQ8=
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260630182238-925bb5da69e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
159-
google.golang.org/grpc v1.82.0 h1:vguDnZUPjE26w09A63VoxZPnvPjB5Riyc0mkXPFmAIU=
160-
google.golang.org/grpc v1.82.0/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
161147
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
162148
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
163149
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎tests/helpers/helpers.go‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,54 @@ package helpers
22

33
import (
44
"bytes"
5-
"context"
6-
"crypto/tls"
75
"net"
86
"net/http"
7+
"net/rpc"
98
"slices"
109
"testing"
1110
"time"
1211

13-
"connectrpc.com/connect"
1412
"github.com/google/uuid"
1513
jobsProto "github.com/roadrunner-server/api-go/v6/jobs/v2"
16-
"github.com/roadrunner-server/api-go/v6/jobs/v2/jobsV2connect"
1714
jobState "github.com/roadrunner-server/api-plugins/v6/jobs"
15+
goridgeRpc "github.com/roadrunner-server/goridge/v4/pkg/rpc"
1816
"github.com/stretchr/testify/assert"
1917
"github.com/stretchr/testify/require"
20-
"golang.org/x/net/http2"
2118
"google.golang.org/protobuf/types/known/emptypb"
2219
)
2320

24-
func NewJobsClient(t *testing.T, address string) jobsV2connect.JobsServiceClient {
21+
const (
22+
push string = "jobs.Push"
23+
pause string = "jobs.Pause"
24+
destroy string = "jobs.Destroy"
25+
resume string = "jobs.Resume"
26+
declare string = "jobs.Declare"
27+
getStats string = "jobs.GetStats"
28+
)
29+
30+
// NewJobsClient dials the RoadRunner RPC endpoint and returns a net/rpc client
31+
// speaking the goridge frame codec (the same transport the PHP SDK uses).
32+
func NewJobsClient(t *testing.T, address string) *rpc.Client {
2533
t.Helper()
26-
httpc := &http.Client{Transport: &http2.Transport{
27-
AllowHTTP: true,
28-
DialTLSContext: func(ctx context.Context, network, addr string, _ *tls.Config) (net.Conn, error) {
29-
return new(net.Dialer).DialContext(ctx, network, addr)
30-
},
31-
}}
32-
t.Cleanup(httpc.CloseIdleConnections)
33-
return jobsV2connect.NewJobsServiceClient(httpc, "http://"+address)
34+
conn, err := (&net.Dialer{}).DialContext(t.Context(), "tcp", address)
35+
require.NoError(t, err)
36+
client := rpc.NewClientWithCodec(goridgeRpc.NewClientCodec(conn))
37+
t.Cleanup(func() { _ = client.Close() })
38+
return client
3439
}
3540

3641
func ResumePipes(address string, pipes ...string) func(t *testing.T) {
3742
return func(t *testing.T) {
3843
client := NewJobsClient(t, address)
39-
_, err := client.Resume(t.Context(), connect.NewRequest(&jobsProto.Pipelines{Pipelines: slices.Clone(pipes)}))
44+
err := client.Call(resume, &jobsProto.Pipelines{Pipelines: slices.Clone(pipes)}, &jobsProto.JobsHandlerResponse{})
4045
require.NoError(t, err)
4146
}
4247
}
4348

4449
func PushToPipe(pipeline string, autoAck bool, address string) func(t *testing.T) {
4550
return func(t *testing.T) {
4651
client := NewJobsClient(t, address)
47-
_, err := client.Push(t.Context(), connect.NewRequest(&jobsProto.PushRequest{Job: createDummyJob(pipeline, autoAck)}))
52+
err := client.Call(push, &jobsProto.PushRequest{Job: createDummyJob(pipeline, autoAck)}, &jobsProto.JobsHandlerResponse{})
4853
require.NoError(t, err)
4954
}
5055
}
@@ -63,7 +68,7 @@ func PushToPipeDelayed(address string, pipeline string, delay int64) func(t *tes
6368
Delay: delay,
6469
},
6570
}}
66-
_, err := client.Push(t.Context(), connect.NewRequest(req))
71+
err := client.Call(push, req, &jobsProto.JobsHandlerResponse{})
6772
assert.NoError(t, err)
6873
}
6974
}
@@ -86,7 +91,7 @@ func createDummyJob(pipeline string, autoAck bool) *jobsProto.Job {
8691
func PausePipelines(address string, pipes ...string) func(t *testing.T) {
8792
return func(t *testing.T) {
8893
client := NewJobsClient(t, address)
89-
_, err := client.Pause(t.Context(), connect.NewRequest(&jobsProto.Pipelines{Pipelines: slices.Clone(pipes)}))
94+
err := client.Call(pause, &jobsProto.Pipelines{Pipelines: slices.Clone(pipes)}, &jobsProto.JobsHandlerResponse{})
9095
require.NoError(t, err)
9196
}
9297
}
@@ -100,7 +105,7 @@ func DestroyPipelines(address string, pipes ...string) func(t *testing.T) {
100105
// without asserting. Some negative tests intentionally destroy
101106
// non-existent pipelines and rely on this silent-after-retry pattern.
102107
for range 10 {
103-
_, err := client.Destroy(t.Context(), connect.NewRequest(req))
108+
err := client.Call(destroy, req, &jobsProto.Pipelines{})
104109
if err == nil {
105110
return
106111
}
@@ -113,12 +118,13 @@ func Stats(address string, state *jobState.State) func(t *testing.T) {
113118
return func(t *testing.T) {
114119
client := NewJobsClient(t, address)
115120

116-
resp, err := client.GetStats(t.Context(), connect.NewRequest(&emptypb.Empty{}))
121+
resp := &jobsProto.Stats{}
122+
err := client.Call(getStats, &emptypb.Empty{}, resp)
117123
require.NoError(t, err)
118124
require.NotNil(t, resp)
119-
require.NotEmpty(t, resp.Msg.GetStats())
125+
require.NotEmpty(t, resp.GetStats())
120126

121-
st := resp.Msg.GetStats()[0]
127+
st := resp.GetStats()[0]
122128
state.Queue = st.GetQueue()
123129
state.Pipeline = st.GetPipeline()
124130
state.Driver = st.GetDriver()

‎tests/jobs_beanstalk_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"tests/helpers"
1515
mocklogger "tests/mock"
1616

17-
"connectrpc.com/connect"
1817
"github.com/beanstalkd/go-beanstalk"
1918
"github.com/google/uuid"
2019
jobsProto "github.com/roadrunner-server/api-go/v6/jobs/v2"
@@ -978,7 +977,7 @@ func declareBeanstalkPipe(address string) func(t *testing.T) {
978977
"priority": "3",
979978
"tube_priority": "10",
980979
}}
981-
_, err := client.Declare(t.Context(), connect.NewRequest(req))
980+
err := client.Call("jobs.Declare", req, &jobsProto.JobsHandlerResponse{})
982981
require.NoError(t, err)
983982
}
984983
}

0 commit comments

Comments
 (0)