Use different ports in different tests; removed debug output; missing…

… error handling
hypebeast · May 3, 2021 · 4351418 · 4351418
1 parent e599b12
commit 4351418
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/osc/osc.go b/osc/osc.go
@@ -563,7 +563,6 @@ func (c *Client) Connect() error {
 		return err
 	}
 	c.server.SetConnection(c.conn)
-	fmt.Println("DEBUG: client connected")
 	return nil
 }
 
@@ -695,6 +694,9 @@ func (s *Server) ReceivePacket() (Packet, error) {
 
 // readFromConnection retrieves OSC packets.
 func (s *Server) readFromConnection() (Packet, error) {
+	if s.conn == nil {
+		return nil, errors.New("not connected")
+	}
 	if s.ReadTimeout != 0 {
 		if err := s.conn.SetReadDeadline(time.Now().Add(s.ReadTimeout)); err != nil {
 			return nil, err

diff --git a/osc/osc_test.go b/osc/osc_test.go
@@ -673,8 +673,9 @@ func TestServerSend(t *testing.T) {
 
 func TestClientRecv(t *testing.T) {
 	targetServer := Server{
-		Addr: "127.0.0.1:6677",
+		Addr: "127.0.0.1:6678",
 	}
+	defer targetServer.CloseConnection()
 
 	go func() {
 		d := NewStandardDispatcher()
@@ -705,6 +706,7 @@ func TestClientRecv(t *testing.T) {
 
 	msg := NewMessage("/message/test")
 	err := client.Send(msg)
+	defer client.Close()
 	if err != nil {
 		t.Errorf("SendTo failed: %v", err)
 	}