yamux fix test race
This commit is contained in:
parent
5090006e2d
commit
2ec42e5e1f
@ -31,7 +31,7 @@ func TestYamuxTransport_Dial(t *testing.T) {
|
|||||||
mcC, err := fxC.Dial(ctx, fxS.addr)
|
mcC, err := fxC.Dial(ctx, fxS.addr)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Len(t, fxS.accepter.mcs, 1)
|
require.Len(t, fxS.accepter.mcs, 1)
|
||||||
mcS := fxS.accepter.mcs[0]
|
mcS := <-fxS.accepter.mcs
|
||||||
|
|
||||||
var (
|
var (
|
||||||
sData string
|
sData string
|
||||||
@ -83,7 +83,7 @@ func TestWriteBench(t *testing.T) {
|
|||||||
|
|
||||||
mcC, err := fxC.Dial(ctx, fxS.addr)
|
mcC, err := fxC.Dial(ctx, fxS.addr)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
mcS := fxS.accepter.mcs[0]
|
mcS := <-fxS.accepter.mcs
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for i := 0; i < numSubConn; i++ {
|
for i := 0; i < numSubConn; i++ {
|
||||||
@ -139,7 +139,7 @@ func newFixture(t *testing.T) *fixture {
|
|||||||
yamuxTransport: New().(*yamuxTransport),
|
yamuxTransport: New().(*yamuxTransport),
|
||||||
ctrl: gomock.NewController(t),
|
ctrl: gomock.NewController(t),
|
||||||
acc: &accounttest.AccountTestService{},
|
acc: &accounttest.AccountTestService{},
|
||||||
accepter: &testAccepter{},
|
accepter: &testAccepter{mcs: make(chan transport.MultiConn, 100)},
|
||||||
a: new(app.App),
|
a: new(app.App),
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,11 +179,11 @@ func (c *testConf) GetYamux() Config {
|
|||||||
|
|
||||||
type testAccepter struct {
|
type testAccepter struct {
|
||||||
err error
|
err error
|
||||||
mcs []transport.MultiConn
|
mcs chan transport.MultiConn
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *testAccepter) Accept(mc transport.MultiConn) (err error) {
|
func (t *testAccepter) Accept(mc transport.MultiConn) (err error) {
|
||||||
t.mcs = append(t.mcs, mc)
|
t.mcs <- mc
|
||||||
return t.err
|
return t.err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user