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

Use assert.Eventually to correctly handle more timing sensitive tests

This commit is contained in:
Andy Wang 2020-12-23 12:25:58 +00:00
parent dc030fbb47
commit 3e737717bd
No known key found for this signature in database
GPG Key ID: 181B49F9F38F3374
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
internal/multiplex/stream_test.go
View File

@ -152,15 +152,6 @@ func TestStream_Close(t *testing.T) {
return return
} }
// we read something to wait for the test frame to reach our recvBuffer.
// if it's empty by the point we call stream.Close(), the incoming
// frame will be dropped
readBuf := make([]byte, len(testPayload))
_, err = io.ReadFull(stream, readBuf[:1])
if err != nil {
t.Errorf("can't read any data before active closing")
}
err = stream.Close() err = stream.Close()
if err != nil { if err != nil {
t.Error("failed to actively close stream", err) t.Error("failed to actively close stream", err)
@ -175,10 +166,11 @@ func TestStream_Close(t *testing.T) {
} }
sesh.streamsM.Unlock() sesh.streamsM.Unlock()
_, err = io.ReadFull(stream, readBuf[1:]) readBuf := make([]byte, len(testPayload))
if err != nil { assert.Eventually(t, func() bool {
t.Errorf("can't read residual data %v", err) _, err = io.ReadFull(stream, readBuf)
} return err == nil
}, time.Second, 10*time.Millisecond, "can't read residual data", err)
if !bytes.Equal(readBuf, testPayload) { if !bytes.Equal(readBuf, testPayload) {
t.Errorf("read wrong data") t.Errorf("read wrong data")
} }
@ -324,10 +316,12 @@ func TestStream_Read(t *testing.T) {
writingEnd.Write(obfsBuf[:i]) writingEnd.Write(obfsBuf[:i])
stream, _ := sesh.Accept() stream, _ := sesh.Accept()
stream.Close() stream.Close()
i, err := stream.Read(buf)
if err != nil { var err error
t.Error("failed to read", err) assert.Eventually(t, func() bool {
} i, err = stream.Read(buf)
return err == nil
}, time.Second, 10*time.Millisecond, "failed to read", err)
if i != smallPayloadLen { if i != smallPayloadLen {
t.Errorf("expected read %v, got %v", smallPayloadLen, i) t.Errorf("expected read %v, got %v", smallPayloadLen, i)
} }
@ -348,10 +342,11 @@ func TestStream_Read(t *testing.T) {
writingEnd.Write(obfsBuf[:i]) writingEnd.Write(obfsBuf[:i])
stream, _ := sesh.Accept() stream, _ := sesh.Accept()
sesh.Close() sesh.Close()
i, err := stream.Read(buf) var err error
if err != nil { assert.Eventually(t, func() bool {
t.Error("failed to read", err) i, err = stream.Read(buf)
} return err == nil
}, time.Second, 10*time.Millisecond, "failed to read", err)
if i != smallPayloadLen { if i != smallPayloadLen {
t.Errorf("expected read %v, got %v", smallPayloadLen, i) t.Errorf("expected read %v, got %v", smallPayloadLen, i)
} }