Fix ReadLine() EOF handling

Author: asp24

fpmTest/main.go

@@ -22,11 +22,11 @@ const (
 
 const (
 	testData1 = "en taro adun en taro tassadar en taro zeratul"
-	testData2 = "power overwhelming"
+	testData2 = "power overwhelming\n"
 )
 
 func main() {
-	testFPMExecute()
+	//testFPMExecute()
 	testWrapperSocket()
 }
 

pkg/util/line_reader.go

@@ -33,7 +33,7 @@ func ReadLine(r *bufio.Reader) ([]byte, error) {
 			skip = true
 		case io.EOF:
 			// TODO badly-formed line
-			return nil, nil
+			return nil, io.EOF
 		default:
 			return nil, err
 		}

pkg/util/line_reader_test.go

@@ -6,19 +6,20 @@ import (
 	"bytes"
 
 	"github.com/stretchr/testify/assert"
+	"io"
 )
 
-func tf(t *testing.T, in string, out []byte) {
+func tf(t *testing.T, in string, out []byte, expectedErr error) {
 	r := bufio.NewReaderSize(bytes.NewBufferString(in), 16)
 
 	line, err := ReadLine(r)
-	assert.NoError(t, err)
+	assert.Equal(t, expectedErr, err)
 	assert.Equal(t, out, line)
 }
 
 func TestReadLine(t *testing.T) {
-	tf(t, "test\n", []byte("test\n"))
-	tf(t, "test\r\n", []byte("test\n"))
-	tf(t, "no line end", nil)
-	tf(t, "test very long long line\n", nil)
+	tf(t, "test\n", []byte("test\n"), nil)
+	tf(t, "test\r\n", []byte("test\n"), nil)
+	tf(t, "no line end", nil, io.EOF)
+	tf(t, "test very long long line\n", nil, nil)
 }