Explorar el Código

Fix quic package test

- server potentially echoed more bytes than it received
Rod Hynes hace 7 años
padre
commit
7e054d9e8f
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. 2 2
      .travis.yml
  2. 3 3
      psiphon/common/quic/quic_test.go

+ 2 - 2
.travis.yml

@@ -16,7 +16,7 @@ script:
 - go test -race -v ./common/osl
 - go test -race -v ./common/parameters
 - go test -race -v ./common/protocol
-# - go test -race -v ./common/quic
+- go test -race -v ./common/quic
 - go test -race -v ./common/tactics
 # TODO: fix and reenable test, which is failing in TravisCI environment:
 # --- FAIL: TestTunneledTCPIPv4
@@ -34,7 +34,7 @@ script:
 - go test -v -covermode=count -coverprofile=osl.coverprofile ./common/osl
 - go test -v -covermode=count -coverprofile=parameters.coverprofile ./common/parameters
 - go test -v -covermode=count -coverprofile=protocol.coverprofile ./common/protocol
-#- go test -v -covermode=count -coverprofile=quic.coverprofile ./common/quic
+- go test -v -covermode=count -coverprofile=quic.coverprofile ./common/quic
 - go test -v -covermode=count -coverprofile=tactics.coverprofile ./common/tactics
 # TODO: see comment above
 #- sudo -E env "PATH=$PATH" go test -v -covermode=count -coverprofile=tun.coverprofile ./common/tun

+ 3 - 3
psiphon/common/quic/quic_test.go

@@ -60,8 +60,8 @@ func TestQUIC(t *testing.T) {
 			}
 
 			serverGroup.Go(func() error {
+				b := make([]byte, 1024)
 				for {
-					b := make([]byte, 1024)
 					n, err := conn.Read(b)
 					atomic.AddInt64(&serverReceivedBytes, int64(n))
 					if err == io.EOF {
@@ -69,7 +69,7 @@ func TestQUIC(t *testing.T) {
 					} else if err != nil {
 						return common.ContextError(err)
 					}
-					_, err = conn.Write(b)
+					_, err = conn.Write(b[:n])
 					if err != nil {
 						return common.ContextError(err)
 					}
@@ -115,9 +115,9 @@ func TestQUIC(t *testing.T) {
 
 			clientGroup.Go(func() error {
 				defer conn.Close()
+				b := make([]byte, 1024)
 				bytesRead := 0
 				for bytesRead < bytesToSend {
-					b := make([]byte, 1024)
 					n, err := conn.Read(b)
 					bytesRead += n
 					atomic.AddInt64(&clientReceivedBytes, int64(n))