More tidy on tests.

door/input_test.go

@@ -30,7 +30,10 @@ func TestDoorInputConnection(t *testing.T) {
 
 	// unicode 190x43 response
 	buffer := []byte("\x1b[1;1R\x1b[2;3R\x1b[43;190R")
-	server.Write(buffer)
+	_, err = server.Write(buffer)
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	time.Sleep(time.Millisecond)
 
 	// Access Fd (File descriptor) of client for dropfile
@@ -88,13 +91,19 @@ func TestDoorInputConnection(t *testing.T) {
 
 	// These are the commands sent to detect ... throw this all away.
 	buffer = make([]byte, 128)
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %#v", err)
 	}
 	// t.Errorf("Buffer : %#v\n", buffer[:r])
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 
 	keytest := map[string][]int{
 		"\x1b":                             []int{0x1b},
@@ -119,7 +128,10 @@ func TestDoorInputConnection(t *testing.T) {
 
 	for send, get := range keytest {
 		var buffer []byte = []byte(send)
-		server.Write(buffer)
+		_, err = server.Write(buffer)
+		if err != nil {
+			t.Error("server.Write:", err)
+		}
 		time.Sleep(time.Millisecond)
 
 		var recv []int = make([]int, 0)
@@ -165,7 +177,10 @@ func TestDoorInputConnection(t *testing.T) {
 	}
 
 	buffer = make([]byte, 128)
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	r, err := server.Read(buffer)
 	// input_test.go:131: server.Read: &net.OpError{Op:"read", Net:"tcp", Source:(*net.TCPAddr)(0xc000012f00), Addr:(*net.TCPAddr)(0xc000012f30), Err:(*poll.DeadlineExceededError)(0x6c39c0)}
 	if !strings.Contains(err.Error(), "i/o timeout") {
@@ -174,8 +189,10 @@ func TestDoorInputConnection(t *testing.T) {
 	if r != 0 {
 		t.Errorf("Buffer After KeyTest: %#v\n", buffer[:r])
 	}
-	server.SetReadDeadline(time.Time{})
-
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	timeout := d.WaitKey(0, 50)
 	if timeout != -1 {
 		t.Errorf("Expected timeout, got %d / %X", timeout, timeout)
@@ -185,7 +202,10 @@ func TestDoorInputConnection(t *testing.T) {
 
 	// Input test
 	buffer = []byte("1234567890\r")
-	server.Write(buffer)
+	_, err = server.Write(buffer)
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	time.Sleep(time.Millisecond)
 
 	var input string = d.Input(5)
@@ -196,7 +216,10 @@ func TestDoorInputConnection(t *testing.T) {
 
 	// I'm not sure what they extra characters are in the buffer here.
 	buffer = make([]byte, 128)
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	r, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %#v", err)
@@ -206,10 +229,16 @@ func TestDoorInputConnection(t *testing.T) {
 	if result != expected {
 		t.Errorf("Buffer Input(5): Expected %#v, got %#v\n", expected, result)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 
 	buffer = []byte("12345678\x08\x089\r")
-	server.Write(buffer)
+	_, err = server.Write(buffer)
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	time.Sleep(time.Millisecond)
 
 	input = d.Input(5)
@@ -219,7 +248,10 @@ func TestDoorInputConnection(t *testing.T) {
 	}
 
 	buffer = []byte("12\x08\x08\x08987\x00\x48654321\r")
-	server.Write(buffer)
+	_, err = server.Write(buffer)
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	time.Sleep(time.Millisecond)
 
 	input = d.Input(5)

door/menu_test.go

@@ -69,7 +69,10 @@ func TestMenuConnection(t *testing.T) {
 
 	// pre-load unicode 90x40 response
 	var buffer []byte = []byte("\x1b[1;1R\x1b[2;3R\x1b[40;90R")
-	server.Write(buffer)
+	_, err = server.Write(buffer)
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	runtime.Gosched()
 
 	// Access Fd (File descriptor) of client for dropfile
@@ -117,13 +120,19 @@ func TestMenuConnection(t *testing.T) {
 
 	// These are the commands sent to detect ... throw this all away.
 	buffer = make([]byte, 1024)
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
 	// t.Errorf("Buffer : %#v\n", buffer[:r])
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 
 	// Ready to test!
 	var m Menu = Menu{Panel: Panel{Width: 10,
@@ -149,7 +158,10 @@ func TestMenuConnection(t *testing.T) {
 	// preload the key buffer with commands
 	// BUG:  I can't use \x1b[A because of the way extended codes work there.
 	var keys string = "\x00\x50\x00\x50\r" // down, down, ENTER
-	server.Write([]byte(keys))
+	_, err = server.Write([]byte(keys))
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 	time.Sleep(time.Millisecond)
 	runtime.Gosched()
 	if d.Disconnect() {
@@ -172,13 +184,19 @@ func TestMenuConnection(t *testing.T) {
 	}
 
 	// Read the display output
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	var r int
 	r, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	output := string(buffer[:r])
 	// t.Errorf("OUTPUT: (len %d) %#v", r, output)
 
@@ -216,12 +234,18 @@ func TestMenuConnection(t *testing.T) {
 	}
 
 	// Read the display output
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	// TODO:  Check Menu output and verify it is correct.
 	// output = string(buffer[:r])
 
@@ -250,12 +274,18 @@ func TestMenuConnection(t *testing.T) {
 	}
 
 	// Read the display output
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	// output = string(buffer[:r])
 
 	keys = "\x00\x47\r" // HOME, ENTER
@@ -277,12 +307,18 @@ func TestMenuConnection(t *testing.T) {
 	}
 
 	// Read the display output
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	// output = string(buffer[:r])
 
 	_, err = server.Write([]byte("B"))
@@ -306,12 +342,18 @@ func TestMenuConnection(t *testing.T) {
 	// Read the display output
 
 	// i/o timeout
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 100))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 100))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	// output = string(buffer[:r])
 
 	keys = "2\r" // "Down", ENTER
@@ -334,12 +376,18 @@ func TestMenuConnection(t *testing.T) {
 	}
 
 	// Read the display output
-	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	err = server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	_, err = server.Read(buffer)
 	if err != nil {
 		t.Errorf("server.Read: %s", err)
 	}
-	server.SetReadDeadline(time.Time{})
+	err = server.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("server.SetReadDeadLine:", err)
+	}
 	// output = string(buffer[:r])
 	server.Close()
 	client.Close()