Fix/unit tests (#26)

* use constants in netutils_test
* return meaningful errors from epoll fails
* add connect/accept test, improve socket option test output
* add test for multiple consecutive accepts (#8)

Author: iSchluff

netutils_test.go

@@ -2,6 +2,8 @@ package srtgo
 
 import (
 	"testing"
+
+	"golang.org/x/sys/unix"
 )
 
 func TestCreateAddrInetV4(t *testing.T) {
@@ -15,7 +17,7 @@ func TestCreateAddrInetV4(t *testing.T) {
 		t.Error("Ip Address size does not match", size)
 	}
 
-	if ip1.sa_family != 2 {
+	if ip1.sa_family != unix.AF_INET {
 		t.Error("Ip Address family does not match")
 	}
 
@@ -43,7 +45,7 @@ func TestCreateAddrInetV6(t *testing.T) {
 		t.Error("Ipv6 Address size does not match", size)
 	}
 
-	if ip1.sa_family != 30 {
+	if ip1.sa_family != unix.AF_INET6 {
 		t.Error("Ipv6 Address family does not match")
 	}
 	data := []int{31, -102, 0, 0, 0, 0, 32, 1, 13, -72, -123, -93, 0, 0}

srtgo.go

@@ -197,15 +197,15 @@ func (s SrtSocket) Accept() (*SrtSocket, *net.UDPAddr, error) {
 		timeoutMs := C.int64_t(-1)
 		ready := [2]C.int{SRT_INVALID_SOCK, SRT_INVALID_SOCK}
 		if C.srt_epoll_wait(s.epollConnect, &ready[0], &len, nil, nil, timeoutMs, nil, nil, nil, nil) == -1 {
-			return nil, nil, fmt.Errorf("srt accept, epoll wait issue")
+			return nil, nil, fmt.Errorf("srt accept, epoll error: %s", C.GoString(C.srt_getlasterror_str()))
 		}
 	}
 
 	var addr syscall.RawSockaddrAny
 	sclen := C.int(syscall.SizeofSockaddrAny)
 	socket := C.srt_accept(s.socket, (*C.struct_sockaddr)(unsafe.Pointer(&addr)), &sclen)
 	if socket == SRT_INVALID_SOCK {
-		return nil, nil, fmt.Errorf("srt accept, error accepting the connection: %v", C.GoString(C.srt_getlasterror_str()))
+		return nil, nil, fmt.Errorf("srt accept, error accepting the connection: %s", C.GoString(C.srt_getlasterror_str()))
 	}
 
 	newSocket, err := newFromSocket(&s, socket)
@@ -263,7 +263,7 @@ func (s SrtSocket) Connect() error {
 				return fmt.Errorf("srt connect, connection failed %d", state)
 			}
 		} else {
-			return fmt.Errorf("srt connect, epoll wait issue")
+			return fmt.Errorf("srt connect, epoll error: %s", C.GoString(C.srt_getlasterror_str()))
 		}
 	}
 

srtgo_test.go

@@ -1,7 +1,9 @@
 package srtgo
 
 import (
+	"sync"
 	"testing"
+	"time"
 )
 
 func TestNewSocket(t *testing.T) {
@@ -97,19 +99,108 @@ func TestListen(t *testing.T) {
 	}
 }
 
+func AcceptHelper(numSockets int, options map[string]string, t *testing.T) {
+	listening := make(chan struct{})
+	listener := NewSrtSocket("localhost", 8090, options)
+	var connectors []*SrtSocket
+	for i := 0; i < numSockets; i++ {
+		connectors = append(connectors, NewSrtSocket("localhost", 8090, options))
+	}
+	wg := sync.WaitGroup{}
+	timer := time.AfterFunc(time.Second, func() {
+		t.Log("Accept timed out")
+		listener.Close()
+		for _, s := range connectors {
+			s.Close()
+		}
+	})
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
+		<-listening
+		for _, s := range connectors {
+			err := s.Connect()
+			if err != nil {
+				t.Error(err)
+			}
+		}
+	}()
+
+	err := listener.Listen(numSockets)
+	if err != nil {
+		t.Error(err)
+	}
+	listening <- struct{}{}
+	for i := 0; i < numSockets; i++ {
+		sock, addr, err := listener.Accept()
+		if err != nil {
+			t.Error(err)
+		}
+		if sock == nil || addr == nil {
+			t.Error("Expected non-nil addr and sock")
+		}
+	}
+
+	wg.Wait()
+	if timer.Stop() {
+		listener.Close()
+		for _, s := range connectors {
+			s.Close()
+		}
+	}
+}
+
+func TestAcceptNonBlocking(t *testing.T) {
+	InitSRT()
+
+	options := make(map[string]string)
+	options["transtype"] = "file"
+	AcceptHelper(1, options, t)
+}
+
+func TestAcceptBlocking(t *testing.T) {
+	InitSRT()
+
+	options := make(map[string]string)
+	options["blocking"] = "1"
+	options["transtype"] = "file"
+	AcceptHelper(1, options, t)
+}
+
+func TestMultipleAcceptNonBlocking(t *testing.T) {
+	InitSRT()
+
+	options := make(map[string]string)
+	options["transtype"] = "file"
+	AcceptHelper(3, options, t)
+}
+
+func TestMultipleAcceptBlocking(t *testing.T) {
+	InitSRT()
+
+	options := make(map[string]string)
+	options["blocking"] = "1"
+	options["transtype"] = "file"
+	AcceptHelper(3, options, t)
+}
+
 func TestSetSockOptInt(t *testing.T) {
 	InitSRT()
 	options := make(map[string]string)
 	a := NewSrtSocket("localhost", 8090, options)
 
-	err := a.SetSockOptInt(SRTO_LATENCY, 200)
+	expected := 200
+	err := a.SetSockOptInt(SRTO_LATENCY, expected)
 	if err != nil {
-		t.Error("Error on TestSetSockOpt")
+		t.Error(err)
 	}
 
 	v, err := a.GetSockOptInt(SRTO_LATENCY)
-	if v != 200 {
-		t.Error("Error in SetSockOptInt/GetSockOptInt", v)
+	if err != nil {
+		t.Error(err)
+	}
+	if v != expected {
+		t.Errorf("Failed to set SRTO_LATENCY expected %d, got %d\n", expected, v)
 	}
 }
 
@@ -118,14 +209,18 @@ func TestSetSockOptString(t *testing.T) {
 	options := make(map[string]string)
 	a := NewSrtSocket("localhost", 8090, options)
 
-	err := a.SetSockOptString(SRTO_STREAMID, "123")
+	expected := "123"
+	err := a.SetSockOptString(SRTO_STREAMID, expected)
 	if err != nil {
-		t.Error("Error on TestSetSockOpt")
+		t.Error(err)
 	}
 
 	v, err := a.GetSockOptString(SRTO_STREAMID)
-	if v != "123" {
-		t.Error("Error in SetSockOptString/GetSockOptString", v)
+	if err != nil {
+		t.Error(err)
+	}
+	if v != expected {
+		t.Errorf("Failed to set SRTO_STREAMID expected %s, got %s\n", expected, v)
 	}
 }
 
@@ -134,13 +229,17 @@ func TestSetSockOptBool(t *testing.T) {
 	options := make(map[string]string)
 	a := NewSrtSocket("localhost", 8090, options)
 
-	err := a.SetSockOptBool(SRTO_MESSAGEAPI, true)
+	expected := true
+	err := a.SetSockOptBool(SRTO_MESSAGEAPI, expected)
 	if err != nil {
-		t.Error("Error on TestSetSockOpt")
+		t.Error(err)
 	}
 
 	v, err := a.GetSockOptBool(SRTO_MESSAGEAPI)
-	if v != true {
-		t.Error("Error in SetSockOptBool/GetSockOptBool", v)
+	if err != nil {
+		t.Error(err)
+	}
+	if v != expected {
+		t.Errorf("Failed to set SRTO_MESSAGEAPI expected %t, got %t\n", expected, v)
 	}
 }