octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mend protocol tests, for sure

Browse Source
This commit is contained in:
Jakob Borg 2016-01-12 12:12:06 +01:00
parent 91e9ffff85
commit 1df40fbdeb
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/protocol/protocol_test.go
View File

@ -4,6 +4,7 @@ package protocol
import ( import (
"bytes" "bytes"
"encoding/binary"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"errors" "errors"
@ -16,6 +17,7 @@ import (
"strings" "strings"
"testing" "testing"
"testing/quick" "testing/quick"
"time"
"github.com/calmh/xdr" "github.com/calmh/xdr"
) )
@ -107,12 +109,11 @@ func TestVersionErr(t *testing.T) {
c1.ClusterConfig(ClusterConfigMessage{}) c1.ClusterConfig(ClusterConfigMessage{})
w := xdr.NewWriter(c0.cw) w := xdr.NewWriter(c0.cw)
w.WriteUint32(encodeHeader(header{ timeoutWriteHeader(w, header{
version: 2, // higher than supported version: 2, // higher than supported
msgID: 0, msgID: 0,
msgType: messageTypeIndex, msgType: messageTypeIndex,
})) })
w.WriteUint32(0) // Avoids reader closing due to EOF
if err := m1.closedError(); err == nil || !strings.Contains(err.Error(), "unknown protocol version") { if err := m1.closedError(); err == nil || !strings.Contains(err.Error(), "unknown protocol version") {
t.Error("Connection should close due to unknown version, not", err) t.Error("Connection should close due to unknown version, not", err)
@ -134,12 +135,11 @@ func TestTypeErr(t *testing.T) {
c1.ClusterConfig(ClusterConfigMessage{}) c1.ClusterConfig(ClusterConfigMessage{})
w := xdr.NewWriter(c0.cw) w := xdr.NewWriter(c0.cw)
w.WriteUint32(encodeHeader(header{ timeoutWriteHeader(w, header{
version: 0, version: 0,
msgID: 0, msgID: 0,
msgType: 42, msgType: 42, // unknown type
})) })
w.WriteUint32(0) // Avoids reader closing due to EOF
if err := m1.closedError(); err == nil || !strings.Contains(err.Error(), "unknown message type") { if err := m1.closedError(); err == nil || !strings.Contains(err.Error(), "unknown message type") {
t.Error("Connection should close due to unknown message type, not", err) t.Error("Connection should close due to unknown message type, not", err)
@ -298,3 +298,26 @@ func testMarshal(t *testing.T, prefix string, m1, m2 message) bool {
} }
return ok return ok
} }
func timeoutWriteHeader(w *xdr.Writer, hdr header) {
// This tries to write a message header to w, but times out after a while.
// This is useful because in testing, with a PipeWriter, it will block
// forever if the other side isn't reading any more. On the other hand we
// can't just "go" it into the background, because if the other side is
// still there we should wait for the write to complete. Yay.
var buf [8]byte // header and message length
binary.BigEndian.PutUint32(buf[:], encodeHeader(hdr))
binary.BigEndian.PutUint32(buf[4:], 0) // zero message length, explicitly
done := make(chan struct{})
go func() {
w.WriteRaw(buf[:])
l.Infoln("write completed")
close(done)
}()
select {
case <-done:
case <-time.After(250 * time.Millisecond):
}
}