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
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Commit34d97ec

Browse files
authored
chore: fix dial test assertions (#428)
1 parent229cfcf commit34d97ec

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

‎wsnet/dial.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ func (d *Dialer) negotiate(ctx context.Context) (err error) {
290290
return<-errCh
291291
}
292292

293-
// ActiveConnections returns the amount of active connections.
294-
//DialContextopens a connection, and close will end it.
293+
// ActiveConnections returns the amount of active connections. DialContext
294+
// opens a connection, and close will end it.
295295
func (d*Dialer)activeConnections()int {
296296
stats,ok:=d.rtc.GetStats().GetConnectionStats(d.rtc)
297297
if!ok {

‎wsnet/dial_test.go

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ import (
1111
"testing"
1212
"time"
1313

14-
"cdr.dev/slog/sloggers/slogtest"
1514
"github.com/pion/ice/v2"
1615
"github.com/pion/webrtc/v3"
1716
"github.com/stretchr/testify/assert"
1817
"github.com/stretchr/testify/require"
18+
19+
"cdr.dev/slog/sloggers/slogtest"
1920
)
2021

2122
funcExampleDial_basic() {
@@ -260,33 +261,35 @@ func TestDial(t *testing.T) {
260261
log:=slogtest.Make(t,nil)
261262

262263
listener,err:=net.Listen("tcp","0.0.0.0:0")
263-
iferr!=nil {
264-
t.Error(err)
265-
return
266-
}
264+
require.NoError(t,err)
265+
267266
gofunc() {
268267
_,_=listener.Accept()
269268
}()
269+
270270
connectAddr,listenAddr:=createDumbBroker(t)
271271
_,err=Listen(context.Background(),slogtest.Make(t,nil),listenAddr,"")
272-
iferr!=nil {
273-
t.Error(err)
274-
return
275-
}
272+
require.NoError(t,err)
276273

277274
dialer,err:=DialWebsocket(context.Background(),connectAddr,&DialOptions{
278275
Log:&log,
279276
},nil)
280-
iferr!=nil {
281-
t.Error(err)
282-
}
283-
conn,_:=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
277+
require.NoError(t,err)
278+
279+
conn,err:=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
280+
require.NoError(t,err)
284281
assert.Equal(t,1,dialer.activeConnections())
282+
285283
_=conn.Close()
286284
assert.Equal(t,0,dialer.activeConnections())
287-
_,_=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
288-
conn,_=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
285+
286+
_,err=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
287+
require.NoError(t,err)
288+
289+
conn,err=dialer.DialContext(context.Background(),listener.Addr().Network(),listener.Addr().String())
290+
require.NoError(t,err)
289291
assert.Equal(t,2,dialer.activeConnections())
292+
290293
_=conn.Close()
291294
assert.Equal(t,1,dialer.activeConnections())
292295
})

0 commit comments

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