erik/converge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using AssertReadData/AssertWriteData now where possible.

Browse Source
This commit is contained in:
Erik Brakkee 2024-08-22 17:01:04 +02:00
parent 1fd4de471c
commit 6e97162923
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/comms/agentserver_test.go
View File

@ -130,32 +130,16 @@ func (s *AgentServerTestSuite) Test_ConnectThroughYamux() {
func() any { func() any {
conn, err := agentCommChannel.Session.OpenStream() conn, err := agentCommChannel.Session.OpenStream()
s.Nil(err) s.Nil(err)
n, err := conn.Write([]byte(dataAgentToServer)) testsupport.AssertWriteData(&s.Suite, dataAgentToServer, conn)
s.Nil(err) testsupport.AssertReadData(&s.Suite, dataServerToAgent, conn)
s.Equal(len(dataAgentToServer), n)
buf := make([]byte, len(dataServerToAgent))
n, err = conn.Read(buf)
s.Nil(err)
s.Equal(len(dataServerToAgent), n)
s.Equal([]byte(dataServerToAgent), buf[:n])
return nil return nil
}, },
func() any { func() any {
conn, err := serverCommChannel.Session.Accept() conn, err := serverCommChannel.Session.Accept()
s.Nil(err) s.Nil(err)
buf := make([]byte, len(dataAgentToServer)) testsupport.AssertReadData(&s.Suite, dataAgentToServer, conn)
n, err := conn.Read(buf) testsupport.AssertWriteData(&s.Suite, dataServerToAgent, conn)
s.Nil(err)
s.Equal(len(dataAgentToServer), n)
s.Equal([]byte(dataAgentToServer), buf[:n])
n, err = conn.Write([]byte(dataServerToAgent))
s.Nil(err)
s.Equal(len(dataServerToAgent), n)
return nil return nil
}) })
} }

10
pkg/testsupport/inmemoryconnection_test.go
View File

@ -49,14 +49,8 @@ func (s *InMemoryTestSuite) TearDownTest() {
func (s *InMemoryTestSuite) SendReceive(a io.ReadWriteCloser, b io.ReadWriteCloser) { func (s *InMemoryTestSuite) SendReceive(a io.ReadWriteCloser, b io.ReadWriteCloser) {
data := "hello" data := "hello"
n, err := a.Write([]byte(data)) AssertWriteData(&s.Suite, data, a)
s.Nil(err) AssertReadData(&s.Suite, data, b)
s.Equal(len(data), n)
buf := make([]byte, len(data)*2)
n, err = b.Read(buf)
s.Nil(err)
s.Equal([]byte(data), buf[:n])
} }
func (s *InMemoryTestSuite) Test_SendReceive1() { func (s *InMemoryTestSuite) Test_SendReceive1() {