Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf670bc3

Browse files
authored
chore: update testutil chan helpers (#17408)
1 parent2a76f50 commitf670bc3

File tree

45 files changed

+582
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+582
-559
lines changed

‎agent/agent_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestAgent_ImmediateClose(t *testing.T) {
110110
})
111111

112112
// wait until the agent has connected and is starting to find races in the startup code
113-
_=testutil.RequireRecvCtx(ctx,t,client.GetStartup())
113+
_=testutil.TryReceive(ctx,t,client.GetStartup())
114114
t.Log("Closing Agent")
115115
err:=agentUnderTest.Close()
116116
require.NoError(t,err)
@@ -1700,7 +1700,7 @@ func TestAgent_Lifecycle(t *testing.T) {
17001700
// In order to avoid shutting down the agent before it is fully started and triggering
17011701
// errors, we'll wait until the agent is fully up. It's a bit hokey, but among the last things the agent starts
17021702
// is the stats reporting, so getting a stats report is a good indication the agent is fully up.
1703-
_=testutil.RequireRecvCtx(ctx,t,statsCh)
1703+
_=testutil.TryReceive(ctx,t,statsCh)
17041704

17051705
err:=agent.Close()
17061706
require.NoError(t,err,"agent should be closed successfully")
@@ -1730,7 +1730,7 @@ func TestAgent_Startup(t *testing.T) {
17301730
_,client,_,_,_:=setupAgent(t, agentsdk.Manifest{
17311731
Directory:"",
17321732
},0)
1733-
startup:=testutil.RequireRecvCtx(ctx,t,client.GetStartup())
1733+
startup:=testutil.TryReceive(ctx,t,client.GetStartup())
17341734
require.Equal(t,"",startup.GetExpandedDirectory())
17351735
})
17361736

@@ -1741,7 +1741,7 @@ func TestAgent_Startup(t *testing.T) {
17411741
_,client,_,_,_:=setupAgent(t, agentsdk.Manifest{
17421742
Directory:"~",
17431743
},0)
1744-
startup:=testutil.RequireRecvCtx(ctx,t,client.GetStartup())
1744+
startup:=testutil.TryReceive(ctx,t,client.GetStartup())
17451745
homeDir,err:=os.UserHomeDir()
17461746
require.NoError(t,err)
17471747
require.Equal(t,homeDir,startup.GetExpandedDirectory())
@@ -1754,7 +1754,7 @@ func TestAgent_Startup(t *testing.T) {
17541754
_,client,_,_,_:=setupAgent(t, agentsdk.Manifest{
17551755
Directory:"coder/coder",
17561756
},0)
1757-
startup:=testutil.RequireRecvCtx(ctx,t,client.GetStartup())
1757+
startup:=testutil.TryReceive(ctx,t,client.GetStartup())
17581758
homeDir,err:=os.UserHomeDir()
17591759
require.NoError(t,err)
17601760
require.Equal(t,filepath.Join(homeDir,"coder/coder"),startup.GetExpandedDirectory())
@@ -1767,7 +1767,7 @@ func TestAgent_Startup(t *testing.T) {
17671767
_,client,_,_,_:=setupAgent(t, agentsdk.Manifest{
17681768
Directory:"$HOME",
17691769
},0)
1770-
startup:=testutil.RequireRecvCtx(ctx,t,client.GetStartup())
1770+
startup:=testutil.TryReceive(ctx,t,client.GetStartup())
17711771
homeDir,err:=os.UserHomeDir()
17721772
require.NoError(t,err)
17731773
require.Equal(t,homeDir,startup.GetExpandedDirectory())
@@ -2632,7 +2632,7 @@ done
26322632

26332633
n:=1
26342634
forn<=5 {
2635-
logs:=testutil.RequireRecvCtx(ctx,t,logsCh)
2635+
logs:=testutil.TryReceive(ctx,t,logsCh)
26362636
require.NotNil(t,logs)
26372637
for_,l:=rangelogs.GetLogs() {
26382638
require.Equal(t,fmt.Sprintf("start %d",n),l.GetOutput())
@@ -2645,7 +2645,7 @@ done
26452645

26462646
n=1
26472647
forn<=3000 {
2648-
logs:=testutil.RequireRecvCtx(ctx,t,logsCh)
2648+
logs:=testutil.TryReceive(ctx,t,logsCh)
26492649
require.NotNil(t,logs)
26502650
for_,l:=rangelogs.GetLogs() {
26512651
require.Equal(t,fmt.Sprintf("stop %d",n),l.GetOutput())

‎agent/agentscripts/agentscripts_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestExecuteBasic(t *testing.T) {
4444
}},aAPI.ScriptCompleted)
4545
require.NoError(t,err)
4646
require.NoError(t,runner.Execute(context.Background(),agentscripts.ExecuteAllScripts))
47-
log:=testutil.RequireRecvCtx(ctx,t,fLogger.logs)
47+
log:=testutil.TryReceive(ctx,t,fLogger.logs)
4848
require.Equal(t,"hello",log.Output)
4949
}
5050

@@ -136,7 +136,7 @@ func TestScriptReportsTiming(t *testing.T) {
136136
require.NoError(t,runner.Execute(ctx,agentscripts.ExecuteAllScripts))
137137
runner.Close()
138138

139-
log:=testutil.RequireRecvCtx(ctx,t,fLogger.logs)
139+
log:=testutil.TryReceive(ctx,t,fLogger.logs)
140140
require.Equal(t,"hello",log.Output)
141141

142142
timings:=aAPI.GetTimings()

‎agent/apphealth_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestAppHealth_Healthy(t *testing.T) {
9292
mClock.Advance(999*time.Millisecond).MustWait(ctx)// app2 is now healthy
9393

9494
mClock.Advance(time.Millisecond).MustWait(ctx)// report gets triggered
95-
update:=testutil.RequireRecvCtx(ctx,t,fakeAPI.AppHealthCh())
95+
update:=testutil.TryReceive(ctx,t,fakeAPI.AppHealthCh())
9696
require.Len(t,update.GetUpdates(),2)
9797
applyUpdate(t,apps,update)
9898
require.Equal(t,codersdk.WorkspaceAppHealthHealthy,apps[1].Health)
@@ -101,7 +101,7 @@ func TestAppHealth_Healthy(t *testing.T) {
101101
mClock.Advance(999*time.Millisecond).MustWait(ctx)// app3 is now healthy
102102

103103
mClock.Advance(time.Millisecond).MustWait(ctx)// report gets triggered
104-
update=testutil.RequireRecvCtx(ctx,t,fakeAPI.AppHealthCh())
104+
update=testutil.TryReceive(ctx,t,fakeAPI.AppHealthCh())
105105
require.Len(t,update.GetUpdates(),2)
106106
applyUpdate(t,apps,update)
107107
require.Equal(t,codersdk.WorkspaceAppHealthHealthy,apps[1].Health)
@@ -155,7 +155,7 @@ func TestAppHealth_500(t *testing.T) {
155155
mClock.Advance(999*time.Millisecond).MustWait(ctx)// 2nd check, crosses threshold
156156
mClock.Advance(time.Millisecond).MustWait(ctx)// 2nd report, sends update
157157

158-
update:=testutil.RequireRecvCtx(ctx,t,fakeAPI.AppHealthCh())
158+
update:=testutil.TryReceive(ctx,t,fakeAPI.AppHealthCh())
159159
require.Len(t,update.GetUpdates(),1)
160160
applyUpdate(t,apps,update)
161161
require.Equal(t,codersdk.WorkspaceAppHealthUnhealthy,apps[0].Health)
@@ -223,7 +223,7 @@ func TestAppHealth_Timeout(t *testing.T) {
223223
timeoutTrap.MustWait(ctx).Release()
224224
mClock.Set(ms(3001)).MustWait(ctx)// report tick, sends changes
225225

226-
update:=testutil.RequireRecvCtx(ctx,t,fakeAPI.AppHealthCh())
226+
update:=testutil.TryReceive(ctx,t,fakeAPI.AppHealthCh())
227227
require.Len(t,update.GetUpdates(),1)
228228
applyUpdate(t,apps,update)
229229
require.Equal(t,codersdk.WorkspaceAppHealthUnhealthy,apps[0].Health)

‎agent/checkpoint_internal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ func TestCheckpoint_WaitComplete(t *testing.T) {
4444
errCh<-uut.wait(ctx)
4545
}()
4646
uut.complete(err)
47-
got:=testutil.RequireRecvCtx(ctx,t,errCh)
47+
got:=testutil.TryReceive(ctx,t,errCh)
4848
require.Equal(t,err,got)
4949
}

‎agent/stats_internal_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ func TestStatsReporter(t *testing.T) {
3434
}()
3535

3636
// initial request to get duration
37-
req:=testutil.RequireRecvCtx(ctx,t,fDest.reqs)
37+
req:=testutil.TryReceive(ctx,t,fDest.reqs)
3838
require.NotNil(t,req)
3939
require.Nil(t,req.Stats)
4040
interval:=time.Second*34
41-
testutil.RequireSendCtx(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval)})
41+
testutil.RequireSend(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval)})
4242

4343
// call to source to set the callback and interval
44-
gotInterval:=testutil.RequireRecvCtx(ctx,t,fSource.period)
44+
gotInterval:=testutil.TryReceive(ctx,t,fSource.period)
4545
require.Equal(t,interval,gotInterval)
4646

4747
// callback returning netstats
@@ -60,7 +60,7 @@ func TestStatsReporter(t *testing.T) {
6060
fSource.callback(time.Now(),time.Now(),netStats,nil)
6161

6262
// collector called to complete the stats
63-
gotNetStats:=testutil.RequireRecvCtx(ctx,t,fCollector.calls)
63+
gotNetStats:=testutil.TryReceive(ctx,t,fCollector.calls)
6464
require.Equal(t,netStats,gotNetStats)
6565

6666
// while we are collecting the stats, send in two new netStats to simulate
@@ -94,13 +94,13 @@ func TestStatsReporter(t *testing.T) {
9494

9595
// complete first collection
9696
stats:=&proto.Stats{SessionCountJetbrains:55}
97-
testutil.RequireSendCtx(ctx,t,fCollector.stats,stats)
97+
testutil.RequireSend(ctx,t,fCollector.stats,stats)
9898

9999
// destination called to report the first stats
100-
update:=testutil.RequireRecvCtx(ctx,t,fDest.reqs)
100+
update:=testutil.TryReceive(ctx,t,fDest.reqs)
101101
require.NotNil(t,update)
102102
require.Equal(t,stats,update.Stats)
103-
testutil.RequireSendCtx(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval)})
103+
testutil.RequireSend(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval)})
104104

105105
// second update -- netStat0 and netStats1 are accumulated and reported
106106
wantNetStats:=map[netlogtype.Connection]netlogtype.Counts{
@@ -115,22 +115,22 @@ func TestStatsReporter(t *testing.T) {
115115
RxBytes:21,
116116
},
117117
}
118-
gotNetStats=testutil.RequireRecvCtx(ctx,t,fCollector.calls)
118+
gotNetStats=testutil.TryReceive(ctx,t,fCollector.calls)
119119
require.Equal(t,wantNetStats,gotNetStats)
120120
stats=&proto.Stats{SessionCountJetbrains:66}
121-
testutil.RequireSendCtx(ctx,t,fCollector.stats,stats)
122-
update=testutil.RequireRecvCtx(ctx,t,fDest.reqs)
121+
testutil.RequireSend(ctx,t,fCollector.stats,stats)
122+
update=testutil.TryReceive(ctx,t,fDest.reqs)
123123
require.NotNil(t,update)
124124
require.Equal(t,stats,update.Stats)
125125
interval2:=27*time.Second
126-
testutil.RequireSendCtx(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval2)})
126+
testutil.RequireSend(ctx,t,fDest.resps,&proto.UpdateStatsResponse{ReportInterval:durationpb.New(interval2)})
127127

128128
// set the new interval
129-
gotInterval=testutil.RequireRecvCtx(ctx,t,fSource.period)
129+
gotInterval=testutil.TryReceive(ctx,t,fSource.period)
130130
require.Equal(t,interval2,gotInterval)
131131

132132
loopCancel()
133-
err:=testutil.RequireRecvCtx(ctx,t,loopErr)
133+
err:=testutil.TryReceive(ctx,t,loopErr)
134134
require.NoError(t,err)
135135
}
136136

‎cli/cliui/prompt_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestPrompt(t *testing.T) {
3535
}()
3636
ptty.ExpectMatch("Example")
3737
ptty.WriteLine("hello")
38-
resp:=testutil.RequireRecvCtx(ctx,t,msgChan)
38+
resp:=testutil.TryReceive(ctx,t,msgChan)
3939
require.Equal(t,"hello",resp)
4040
})
4141

@@ -54,7 +54,7 @@ func TestPrompt(t *testing.T) {
5454
}()
5555
ptty.ExpectMatch("Example")
5656
ptty.WriteLine("yes")
57-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
57+
resp:=testutil.TryReceive(ctx,t,doneChan)
5858
require.Equal(t,"yes",resp)
5959
})
6060

@@ -91,7 +91,7 @@ func TestPrompt(t *testing.T) {
9191
doneChan<-resp
9292
}()
9393

94-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
94+
resp:=testutil.TryReceive(ctx,t,doneChan)
9595
require.Equal(t,"yes",resp)
9696
// Close the reader to end the io.Copy
9797
require.NoError(t,ptty.Close(),"close eof reader")
@@ -115,7 +115,7 @@ func TestPrompt(t *testing.T) {
115115
}()
116116
ptty.ExpectMatch("Example")
117117
ptty.WriteLine("{}")
118-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
118+
resp:=testutil.TryReceive(ctx,t,doneChan)
119119
require.Equal(t,"{}",resp)
120120
})
121121

@@ -133,7 +133,7 @@ func TestPrompt(t *testing.T) {
133133
}()
134134
ptty.ExpectMatch("Example")
135135
ptty.WriteLine("{a")
136-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
136+
resp:=testutil.TryReceive(ctx,t,doneChan)
137137
require.Equal(t,"{a",resp)
138138
})
139139

@@ -153,7 +153,7 @@ func TestPrompt(t *testing.T) {
153153
ptty.WriteLine(`{
154154
"test": "wow"
155155
}`)
156-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
156+
resp:=testutil.TryReceive(ctx,t,doneChan)
157157
require.Equal(t,`{"test":"wow"}`,resp)
158158
})
159159

@@ -178,7 +178,7 @@ func TestPrompt(t *testing.T) {
178178
}()
179179
ptty.ExpectMatch("Example")
180180
ptty.WriteLine("foo\nbar\nbaz\n\n\nvalid\n")
181-
resp:=testutil.RequireRecvCtx(ctx,t,doneChan)
181+
resp:=testutil.TryReceive(ctx,t,doneChan)
182182
require.Equal(t,"valid",resp)
183183
})
184184
}

‎cli/portforward_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ func TestPortForward(t *testing.T) {
192192
require.ErrorIs(t,err,context.Canceled)
193193

194194
flushCtx:=testutil.Context(t,testutil.WaitShort)
195-
testutil.RequireSendCtx(flushCtx,t,wuTick,dbtime.Now())
196-
_=testutil.RequireRecvCtx(flushCtx,t,wuFlush)
195+
testutil.RequireSend(flushCtx,t,wuTick,dbtime.Now())
196+
_=testutil.TryReceive(flushCtx,t,wuFlush)
197197
updated,err:=client.Workspace(context.Background(),workspace.ID)
198198
require.NoError(t,err)
199199
require.Greater(t,updated.LastUsedAt,workspace.LastUsedAt)
@@ -247,8 +247,8 @@ func TestPortForward(t *testing.T) {
247247
require.ErrorIs(t,err,context.Canceled)
248248

249249
flushCtx:=testutil.Context(t,testutil.WaitShort)
250-
testutil.RequireSendCtx(flushCtx,t,wuTick,dbtime.Now())
251-
_=testutil.RequireRecvCtx(flushCtx,t,wuFlush)
250+
testutil.RequireSend(flushCtx,t,wuTick,dbtime.Now())
251+
_=testutil.TryReceive(flushCtx,t,wuFlush)
252252
updated,err:=client.Workspace(context.Background(),workspace.ID)
253253
require.NoError(t,err)
254254
require.Greater(t,updated.LastUsedAt,workspace.LastUsedAt)
@@ -315,8 +315,8 @@ func TestPortForward(t *testing.T) {
315315
require.ErrorIs(t,err,context.Canceled)
316316

317317
flushCtx:=testutil.Context(t,testutil.WaitShort)
318-
testutil.RequireSendCtx(flushCtx,t,wuTick,dbtime.Now())
319-
_=testutil.RequireRecvCtx(flushCtx,t,wuFlush)
318+
testutil.RequireSend(flushCtx,t,wuTick,dbtime.Now())
319+
_=testutil.TryReceive(flushCtx,t,wuFlush)
320320
updated,err:=client.Workspace(context.Background(),workspace.ID)
321321
require.NoError(t,err)
322322
require.Greater(t,updated.LastUsedAt,workspace.LastUsedAt)
@@ -372,8 +372,8 @@ func TestPortForward(t *testing.T) {
372372
require.ErrorIs(t,err,context.Canceled)
373373

374374
flushCtx:=testutil.Context(t,testutil.WaitShort)
375-
testutil.RequireSendCtx(flushCtx,t,wuTick,dbtime.Now())
376-
_=testutil.RequireRecvCtx(flushCtx,t,wuFlush)
375+
testutil.RequireSend(flushCtx,t,wuTick,dbtime.Now())
376+
_=testutil.TryReceive(flushCtx,t,wuFlush)
377377
updated,err:=client.Workspace(context.Background(),workspace.ID)
378378
require.NoError(t,err)
379379
require.Greater(t,updated.LastUsedAt,workspace.LastUsedAt)

‎cli/ssh_internal_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestCloserStack_Empty(t *testing.T) {
9898
deferclose(closed)
9999
uut.close(nil)
100100
}()
101-
testutil.RequireRecvCtx(ctx,t,closed)
101+
testutil.TryReceive(ctx,t,closed)
102102
}
103103

104104
funcTestCloserStack_Context(t*testing.T) {
@@ -157,7 +157,7 @@ func TestCloserStack_CloseAfterContext(t *testing.T) {
157157
err:=uut.push("async",ac)
158158
require.NoError(t,err)
159159
cancel()
160-
testutil.RequireRecvCtx(testCtx,t,ac.started)
160+
testutil.TryReceive(testCtx,t,ac.started)
161161

162162
closed:=make(chanstruct{})
163163
gofunc() {
@@ -174,7 +174,7 @@ func TestCloserStack_CloseAfterContext(t *testing.T) {
174174
}
175175

176176
ac.complete()
177-
testutil.RequireRecvCtx(testCtx,t,closed)
177+
testutil.TryReceive(testCtx,t,closed)
178178
}
179179

180180
funcTestCloserStack_Timeout(t*testing.T) {
@@ -204,20 +204,20 @@ func TestCloserStack_Timeout(t *testing.T) {
204204
}()
205205
trap.MustWait(ctx).Release()
206206
// top starts right away, but it hangs
207-
testutil.RequireRecvCtx(ctx,t,ac[2].started)
207+
testutil.TryReceive(ctx,t,ac[2].started)
208208
// timer pops and we start the middle one
209209
mClock.Advance(gracefulShutdownTimeout).MustWait(ctx)
210-
testutil.RequireRecvCtx(ctx,t,ac[1].started)
210+
testutil.TryReceive(ctx,t,ac[1].started)
211211

212212
// middle one finishes
213213
ac[1].complete()
214214
// bottom starts, but also hangs
215-
testutil.RequireRecvCtx(ctx,t,ac[0].started)
215+
testutil.TryReceive(ctx,t,ac[0].started)
216216

217217
// timer has to pop twice to time out.
218218
mClock.Advance(gracefulShutdownTimeout).MustWait(ctx)
219219
mClock.Advance(gracefulShutdownTimeout).MustWait(ctx)
220-
testutil.RequireRecvCtx(ctx,t,closed)
220+
testutil.TryReceive(ctx,t,closed)
221221
}
222222

223223
typefakeCloserstruct {

‎cli/ssh_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ func TestSSH(t *testing.T) {
271271
}
272272

273273
// Allow one build to complete.
274-
testutil.RequireSendCtx(ctx,t,buildPause,true)
275-
testutil.RequireRecvCtx(ctx,t,buildDone)
274+
testutil.RequireSend(ctx,t,buildPause,true)
275+
testutil.TryReceive(ctx,t,buildDone)
276276

277277
// Allow the remaining builds to continue.
278278
fori:=0;i<len(ptys)-1;i++ {
279-
testutil.RequireSendCtx(ctx,t,buildPause,false)
279+
testutil.RequireSend(ctx,t,buildPause,false)
280280
}
281281

282282
varfoundConflictint
@@ -1017,14 +1017,14 @@ func TestSSH(t *testing.T) {
10171017
}
10181018
}()
10191019

1020-
msg:=testutil.RequireRecvCtx(ctx,t,msgs)
1020+
msg:=testutil.TryReceive(ctx,t,msgs)
10211021
require.Equal(t,"test",msg)
10221022
close(success)
10231023
fsn.Notify()
10241024
<-cmdDone
10251025
fsn.AssertStopped()
10261026
// wait for dial goroutine to complete
1027-
_=testutil.RequireRecvCtx(ctx,t,done)
1027+
_=testutil.TryReceive(ctx,t,done)
10281028

10291029
// wait for the remote socket to get cleaned up before retrying,
10301030
// because cleaning up the socket happens asynchronously, and we

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp