fix(plc4go/spi): avoid test transport getting stuck on a endless loop…

… when filling
apache · May 5, 2023 · 6b8da79 · 6b8da79
1 parent 922c721
commit 6b8da79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/plc4go/internal/cbus/MessageCodec.go b/plc4go/internal/cbus/MessageCodec.go
@@ -116,7 +116,7 @@ func (m *MessageCodec) Receive() (spi.Message, error) {
 				return true
 			}
 		}); err != nil {
-			return nil, errors.Wrap(err, "error filling buffer")
+			log.Debug().Err(err).Msg("Error filling buffer")
 		}
 	}
 	log.Trace().Msg("Buffer filled")

diff --git a/plc4go/internal/cbus/MessageCodec_test.go b/plc4go/internal/cbus/MessageCodec_test.go
@@ -120,7 +120,7 @@ func TestMessageCodec_Receive(t *testing.T) {
 				hashEncountered:               0,
 				currentlyReportedServerErrors: 0,
 			},
-			wantErr: assert.Error,
+			wantErr: assert.NoError,
 		},
 		{
 			name: "checksum error",
@@ -547,8 +547,8 @@ func TestMessageCodec_Receive_Delayed_Response(t *testing.T) {
 		var msg spi.Message
 		var err error
 		msg, err = codec.Receive()
-		// No data yet so this should error
-		assert.Error(t, err)
+		// No data yet so this should return no error and no data
+		assert.NoError(t, err)
 		assert.Nil(t, msg)
 		// Now we add a confirmation
 		transportInstance.FillReadBuffer([]byte("i."))
@@ -578,8 +578,8 @@ func TestMessageCodec_Receive_Delayed_Response(t *testing.T) {
 		var msg spi.Message
 		var err error
 		msg, err = codec.Receive()
-		// No data yet so this should error
-		assert.Error(t, err)
+		// No data yet so this should return no error and no data
+		assert.NoError(t, err)
 		assert.Nil(t, msg)
 		// Now we add a confirmation
 		transportInstance.FillReadBuffer([]byte("i."))
@@ -612,8 +612,8 @@ func TestMessageCodec_Receive_Delayed_Response(t *testing.T) {
 		var msg spi.Message
 		var err error
 		msg, err = codec.Receive()
-		// No data yet so this should error
-		assert.Error(t, err)
+		// No data yet so this should return no error and no data
+		assert.NoError(t, err)
 		assert.Nil(t, msg)
 		// Now we add a confirmation
 		transportInstance.FillReadBuffer([]byte("i."))

diff --git a/plc4go/spi/transports/test/Transport.go b/plc4go/spi/transports/test/Transport.go
@@ -128,16 +128,16 @@ func (m *TransportInstance) FillBuffer(until func(pos uint, currentByte byte, re
 }
 
 func (m *TransportInstance) PeekReadableBytes(numBytes uint32) ([]byte, error) {
-	log.Trace().Msgf("Peek %d readable bytes", numBytes)
 	availableBytes := uint32(math.Min(float64(numBytes), float64(len(m.readBuffer))))
+	log.Trace().Msgf("Peek %d readable bytes (%d available bytes)", numBytes, availableBytes)
 	var err error
 	if availableBytes != numBytes {
 		err = errors.New("not enough bytes available")
 	}
 	if availableBytes == 0 {
 		return nil, err
 	}
-	return m.readBuffer[0:availableBytes], nil
+	return m.readBuffer[0:availableBytes], err
 }
 
 func (m *TransportInstance) Read(numBytes uint32) ([]byte, error) {