Moved more into help_test.

Broke connections switching to io.Pipe.

door/help_test.go

@@ -2,16 +2,19 @@ package door
 
 import (
 	"net"
+	"testing"
+	"time"
 )
 
-// testing helper routines
+// helper routines - to help with testing.
 
-func Future_setupSockets() (server net.Conn, client net.Conn) {
+func setupSockets() (server net.Conn, client net.Conn) {
+	// the better way to set up connections.
 	return net.Pipe()
 }
 
 // setupSockets: return server and client (that's connected to server)
-func setupSockets() (server net.Conn, client net.Conn) {
+func Old_setupSockets() (server net.Conn, client net.Conn) {
 	// establish network socket connection to set Comm_handle
 	var err error
 	var sock net.Listener
@@ -40,3 +43,26 @@ func setupSockets() (server net.Conn, client net.Conn) {
 	sock.Close()
 	return server, client
 }
+
+func clear_socket(socket net.Conn, t *testing.T) string {
+	// Clear out the data that's pending in the socket.
+
+	buffer := make([]byte, 1204)
+	var r int
+	var err error
+
+	err = socket.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
+	if err != nil {
+		t.Error("socket.SetReadDeadLine:", err)
+	}
+	r, err = socket.Read(buffer)
+	if err != nil {
+		t.Errorf("socket.Read: %#v", err)
+	}
+	// t.Errorf("Buffer : %#v\n", buffer[:r])
+	err = socket.SetReadDeadline(time.Time{})
+	if err != nil {
+		t.Error("socket.SetReadDeadLine:", err)
+	}
+	return string(buffer[:r])
+}

door/input_test.go

@@ -11,29 +11,6 @@ import (
 	"time"
 )
 
-func clear_socket(socket net.Conn, t *testing.T) string {
-	// Clear out the data that's pending in the socket.
-
-	buffer := make([]byte, 1204)
-	var r int
-	var err error
-
-	err = socket.SetReadDeadline(time.Now().Add(time.Millisecond * 20))
-	if err != nil {
-		t.Error("socket.SetReadDeadLine:", err)
-	}
-	r, err = socket.Read(buffer)
-	if err != nil {
-		t.Errorf("socket.Read: %#v", err)
-	}
-	// t.Errorf("Buffer : %#v\n", buffer[:r])
-	err = socket.SetReadDeadline(time.Time{})
-	if err != nil {
-		t.Error("socket.SetReadDeadLine:", err)
-	}
-	return string(buffer[:r])
-}
-
 func TestDoorInputConnection(t *testing.T) {
 	var tmpFile *os.File
 	var err error
@@ -120,23 +97,6 @@ func TestDoorInputConnection(t *testing.T) {
 
 	clear_socket(server, t)
 	// This should all be received by above (I think)...
-	/*
-		// These are the commands sent to detect ... throw this all away.
-		buffer = make([]byte, 128)
-		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])
-		err = server.SetReadDeadline(time.Time{})
-		if err != nil {
-			t.Error("server.SetReadDeadLine:", err)
-		}
-	*/
 
 	keytest := map[string][]rune{
 		"\x1b":     []rune{0x1b},