Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Commit 0f64187

Browse files
bors[bot]rustatian
bors[bot]
and
rustatian
authored
Merge #35
35: tests update, code simplify, remove unused r=48d90782 a=48d90782 1. Update non-breaking errors handling in tests 2. Update CI golangci-lint usage (skip errors handling check) 3. Simplify code, remove unused Co-authored-by: Valery Piashchynski <[email protected]>
2 parents 79831d5 + 9592d2f commit 0f64187

20 files changed

+776
-261
lines changed

‎.github/workflows/ci-build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,6 @@ jobs:
8989
uses: reviewdog/action-golangci-lint@v1
9090
with:
9191
github_token: ${{ secrets.github_token }}
92+
golangci_lint_flags: "-D errcheck"
93+
9294

‎broker/amqp/broker_test.go

+98-31
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,87 @@ var (
2424
func TestBroker_Init(t *testing.T) {
2525
b := &Broker{}
2626
ok, err := b.Init(cfg)
27+
if err != nil {
28+
t.Fatal(err)
29+
}
2730
assert.True(t, ok)
2831
assert.NoError(t, err)
2932
}
3033

3134
func TestBroker_StopNotStarted(t *testing.T) {
3235
b := &Broker{}
33-
b.Init(cfg)
36+
_, err := b.Init(cfg)
37+
if err != nil {
38+
t.Fatal(err)
39+
}
3440

3541
b.Stop()
3642
}
3743

3844
func TestBroker_Register(t *testing.T) {
3945
b := &Broker{}
40-
b.Init(cfg)
46+
_, err := b.Init(cfg)
47+
if err != nil {
48+
t.Fatal(err)
49+
}
4150
assert.NoError(t, b.Register(pipe))
4251
}
4352

4453
func TestBroker_Register_Twice(t *testing.T) {
4554
b := &Broker{}
46-
b.Init(cfg)
55+
_, err := b.Init(cfg)
56+
if err != nil {
57+
t.Fatal(err)
58+
}
4759
assert.NoError(t, b.Register(pipe))
4860
assert.Error(t, b.Register(pipe))
4961
}
5062

5163
func TestBroker_Consume_Nil_BeforeServe(t *testing.T) {
5264
b := &Broker{}
53-
b.Init(cfg)
54-
b.Register(pipe)
65+
_, err := b.Init(cfg)
66+
if err != nil {
67+
t.Fatal(err)
68+
}
69+
err = b.Register(pipe)
70+
if err != nil {
71+
t.Fatal(err)
72+
}
5573
assert.NoError(t, b.Consume(pipe, nil, nil))
5674
}
5775

5876
func TestBroker_Consume_Undefined(t *testing.T) {
5977
b := &Broker{}
60-
b.Init(cfg)
78+
_, err := b.Init(cfg)
79+
if err != nil {
80+
t.Fatal(err)
81+
}
6182

6283
assert.Error(t, b.Consume(pipe, nil, nil))
6384
}
6485

6586
func TestBroker_Consume_BeforeServe(t *testing.T) {
6687
b := &Broker{}
67-
b.Init(cfg)
68-
b.Register(pipe)
69-
88+
_, err := b.Init(cfg)
89+
if err != nil {
90+
t.Fatal(err)
91+
}
92+
err = b.Register(pipe)
93+
if err != nil {
94+
t.Fatal(err)
95+
}
7096
exec := make(chan jobs.Handler)
71-
err := func(id string, j *jobs.Job, err error) {}
97+
errf := func(id string, j *jobs.Job, err error) {}
7298

73-
assert.NoError(t, b.Consume(pipe, exec, err))
99+
assert.NoError(t, b.Consume(pipe, exec, errf))
74100
}
75101

76102
func TestBroker_Consume_BadPipeline(t *testing.T) {
77103
b := &Broker{}
78-
b.Init(cfg)
104+
_, err := b.Init(cfg)
105+
if err != nil {
106+
t.Fatal(err)
107+
}
79108
assert.Error(t, b.Register(&jobs.Pipeline{
80109
"broker": "amqp",
81110
"name": "default",
@@ -86,10 +115,18 @@ func TestBroker_Consume_BadPipeline(t *testing.T) {
86115

87116
func TestBroker_Consume_Serve_Nil_Stop(t *testing.T) {
88117
b := &Broker{}
89-
b.Init(cfg)
90-
b.Register(pipe)
91-
92-
b.Consume(pipe, nil, nil)
118+
_, err := b.Init(cfg)
119+
if err != nil {
120+
t.Fatal(err)
121+
}
122+
err = b.Register(pipe)
123+
if err != nil {
124+
t.Fatal(err)
125+
}
126+
err = b.Consume(pipe, nil, nil)
127+
if err != nil {
128+
t.Fatal(err)
129+
}
93130

94131
wait := make(chan interface{})
95132
go func() {
@@ -104,22 +141,34 @@ func TestBroker_Consume_Serve_Nil_Stop(t *testing.T) {
104141

105142
func TestBroker_Consume_CantStart(t *testing.T) {
106143
b := &Broker{}
107-
b.Init(&Config{
144+
_, err := b.Init(&Config{
108145
Addr: "amqp://guest:guest@localhost:15672/",
109146
})
147+
if err != nil {
148+
t.Fatal(err)
149+
}
110150

111151
assert.Error(t, b.Serve())
112152
}
113153

114154
func TestBroker_Consume_Serve_Stop(t *testing.T) {
115155
b := &Broker{}
116-
b.Init(cfg)
117-
b.Register(pipe)
156+
_, err := b.Init(cfg)
157+
if err != nil {
158+
t.Fatal(err)
159+
}
160+
err = b.Register(pipe)
161+
if err != nil {
162+
t.Fatal(err)
163+
}
118164

119165
exec := make(chan jobs.Handler)
120-
err := func(id string, j *jobs.Job, err error) {}
166+
errf := func(id string, j *jobs.Job, err error) {}
121167

122-
b.Consume(pipe, exec, err)
168+
err = b.Consume(pipe, exec, errf)
169+
if err != nil {
170+
t.Fatal()
171+
}
123172

124173
wait := make(chan interface{})
125174
go func() {
@@ -134,25 +183,40 @@ func TestBroker_Consume_Serve_Stop(t *testing.T) {
134183

135184
func TestBroker_PushToNotRunning(t *testing.T) {
136185
b := &Broker{}
137-
b.Init(cfg)
138-
b.Register(pipe)
186+
_, err := b.Init(cfg)
187+
if err != nil {
188+
t.Fatal(err)
189+
}
190+
err = b.Register(pipe)
191+
if err != nil {
192+
t.Fatal(err)
193+
}
139194

140-
_, err := b.Push(pipe, &jobs.Job{})
195+
_, err = b.Push(pipe, &jobs.Job{})
141196
assert.Error(t, err)
142197
}
143198

144199
func TestBroker_StatNotRunning(t *testing.T) {
145200
b := &Broker{}
146-
b.Init(cfg)
147-
b.Register(pipe)
201+
_, err := b.Init(cfg)
202+
if err != nil {
203+
t.Fatal(err)
204+
}
205+
err = b.Register(pipe)
206+
if err != nil {
207+
t.Fatal(err)
208+
}
148209

149-
_, err := b.Stat(pipe)
210+
_, err = b.Stat(pipe)
150211
assert.Error(t, err)
151212
}
152213

153214
func TestBroker_PushToNotRegistered(t *testing.T) {
154215
b := &Broker{}
155-
b.Init(cfg)
216+
_, err := b.Init(cfg)
217+
if err != nil {
218+
t.Fatal(err)
219+
}
156220

157221
ready := make(chan interface{})
158222
b.Listen(func(event int, ctx interface{}) {
@@ -166,13 +230,16 @@ func TestBroker_PushToNotRegistered(t *testing.T) {
166230

167231
<-ready
168232

169-
_, err := b.Push(pipe, &jobs.Job{})
233+
_, err = b.Push(pipe, &jobs.Job{})
170234
assert.Error(t, err)
171235
}
172236

173237
func TestBroker_StatNotRegistered(t *testing.T) {
174238
b := &Broker{}
175-
b.Init(cfg)
239+
_, err := b.Init(cfg)
240+
if err != nil {
241+
t.Fatal(err)
242+
}
176243

177244
ready := make(chan interface{})
178245
b.Listen(func(event int, ctx interface{}) {
@@ -186,6 +253,6 @@ func TestBroker_StatNotRegistered(t *testing.T) {
186253

187254
<-ready
188255

189-
_, err := b.Stat(pipe)
256+
_, err = b.Stat(pipe)
190257
assert.Error(t, err)
191258
}

‎broker/amqp/conn.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ type chanPool struct {
2020
// manages single channel
2121
type channel struct {
2222
ch *amqp.Channel
23-
consumer string
23+
// todo unused
24+
//consumer string
2425
confirm chan amqp.Confirmation
2526
signal chan error
2627
}

‎broker/amqp/consume_test.go

+21-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import (
1010

1111
func TestBroker_Consume_Job(t *testing.T) {
1212
b := &Broker{}
13-
b.Init(cfg)
13+
_, err := b.Init(cfg)
14+
if err != nil {
15+
t.Fatal(err)
16+
}
1417
b.Register(pipe)
1518

1619
ready := make(chan interface{})
@@ -50,7 +53,10 @@ func TestBroker_Consume_Job(t *testing.T) {
5053

5154
func TestBroker_ConsumeAfterStart_Job(t *testing.T) {
5255
b := &Broker{}
53-
b.Init(cfg)
56+
_, err := b.Init(cfg)
57+
if err != nil {
58+
t.Fatal(err)
59+
}
5460
b.Register(pipe)
5561

5662
ready := make(chan interface{})
@@ -90,7 +96,11 @@ func TestBroker_ConsumeAfterStart_Job(t *testing.T) {
9096

9197
func TestBroker_Consume_Delayed(t *testing.T) {
9298
b := &Broker{}
93-
b.Init(cfg)
99+
_, err := b.Init(cfg)
100+
if err != nil {
101+
t.Fatal(err)
102+
}
103+
94104
b.Register(pipe)
95105

96106
ready := make(chan interface{})
@@ -135,7 +145,10 @@ func TestBroker_Consume_Delayed(t *testing.T) {
135145

136146
func TestBroker_Consume_Errored(t *testing.T) {
137147
b := &Broker{}
138-
b.Init(cfg)
148+
_, err := b.Init(cfg)
149+
if err != nil {
150+
t.Fatal(err)
151+
}
139152
b.Register(pipe)
140153

141154
ready := make(chan interface{})
@@ -178,7 +191,10 @@ func TestBroker_Consume_Errored(t *testing.T) {
178191

179192
func TestBroker_Consume_Errored_Attempts(t *testing.T) {
180193
b := &Broker{}
181-
b.Init(cfg)
194+
_, err := b.Init(cfg)
195+
if err != nil {
196+
t.Fatal(err)
197+
}
182198
b.Register(pipe)
183199

184200
ready := make(chan interface{})

0 commit comments

Comments
 (0)