kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce the amount of goroutines in tests

This commit is contained in:
Andy Wang 2020-04-11 23:09:51 +01:00
parent 17fd78b6c2
commit 8a76afabf7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/server/TLS.go
View File

@ -63,7 +63,7 @@ func (TLS) makeResponder(clientHelloSessionId []byte, sharedSecret [32]byte) Res
_, err = originalConn.Write(reply)
if err != nil {
err = fmt.Errorf("failed to write TLS reply: %v", err)
go originalConn.Close()
originalConn.Close()
return
}
preparedConn = &common.TLSConn{Conn: originalConn}

2
internal/server/websocket.go
View File

@ -61,7 +61,7 @@ func (WebSocket) makeResponder(reqPacket []byte, sharedSecret [32]byte) Responde
_, err = preparedConn.Write(reply)
if err != nil {
err = fmt.Errorf("failed to write reply: %v", err)
go preparedConn.Close()
preparedConn.Close()
return
}
return

7
internal/test/integration_test.go
View File

@ -21,6 +21,8 @@ import (
log "github.com/sirupsen/logrus"
)
const numConns = 200 // -race option limits the number of goroutines to 8192
func serveTCPEcho(l net.Listener) {
for {
conn, err := l.Accept()
@ -178,7 +180,7 @@ func runEchoTest(t *testing.T, conns []net.Conn, maxMsgLen int) {
func TestUDP(t *testing.T) {
var tmpDB, _ = ioutil.TempFile("", "ck_user_info")
defer os.Remove(tmpDB.Name())
log.SetLevel(log.TraceLevel)
log.SetLevel(log.FatalLevel)
worldState := common.WorldOfTime(time.Unix(10, 0))
lcc, rcc, ai := basicClientConfigs(worldState)
@ -272,7 +274,6 @@ func TestTCP(t *testing.T) {
t.Run("user echo", func(t *testing.T) {
go serveTCPEcho(pxyServerL)
const numConns = 2000 // -race option limits the number of goroutines to 8192
var conns [numConns]net.Conn
for i := 0; i < numConns; i++ {
conns[i], err = pxyClientD.Dial("", "")
@ -286,7 +287,6 @@ func TestTCP(t *testing.T) {
t.Run("redir echo", func(t *testing.T) {
go serveTCPEcho(rdirServerL)
const numConns = 2000 // -race option limits the number of goroutines to 8192
var conns [numConns]net.Conn
for i := 0; i < numConns; i++ {
conns[i], err = dialerToCkServer.Dial("", "")
@ -371,7 +371,6 @@ func BenchmarkThroughput(b *testing.B) {
})
b.Run("multi conn", func(b *testing.B) {
const numConns = 1024
for i := 0; i < numConns; i++ {
go func() {
serverConn, _ := pxyServerL.Accept()