Expand tests

README.md

@@ -1,6 +1,10 @@
 # go-reuseport
 
-[![travisbadge](https://travis-ci.org/libp2p/go-reuseport.svg)](https://travis-ci.org/libp2p/go-reuseport)
+[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai)
+[![](https://img.shields.io/badge/project-libp2p-blue.svg?style=flat-square)](https://libp2p.io/)
+[![](https://img.shields.io/badge/freenode-%23libp2p-blue.svg?style=flat-square)](https://webchat.freenode.net/?channels=%23libp2p)
+[![codecov](https://codecov.io/gh/libp2p/go-reuseport/branch/master/graph/badge.svg)](https://codecov.io/gh/libp2p/go-reuseport)
+[![Travis CI](https://travis-ci.org/libp2p/go-reuseport.svg?branch=master)](https://travis-ci.org/libp2p/go-reuseport)
 
 **NOTE:** This package REQUIRES go >= 1.11.
 

addr_test.go

@@ -0,0 +1,27 @@
+package reuseport
+
+import (
+	"testing"
+)
+
+type netAddr struct {
+	address string
+	network string
+}
+
+func TestResolveAddr(t *testing.T) {
+	netAddrs := []netAddr{
+		netAddr{"127.0.0.1", "ip"}, netAddr{"127.0.0.1", "ip4"},
+		netAddr{"::1", "ip6"}, netAddr{"127.0.0.1:1234", "tcp"},
+		netAddr{"127.0.0.1:1234", "tcp4"}, netAddr{"[::1]:1234", "tcp6"},
+		netAddr{"127.0.0.1:1234", "udp"}, netAddr{"127.0.0.1:1234", "udp4"},
+		netAddr{"[::1]:1234", "udp6"}, netAddr{"127.0.0.1:1234", "unix"},
+		netAddr{"127.0.0.1:1234", "unixgram"}, netAddr{"127.0.0.1:1234", "unixpacket"},
+	}
+	for _, na := range netAddrs {
+		_, err := ResolveAddr(na.network, na.address)
+		if err != nil {
+			t.Errorf("Failed to resolve address %v", err)
+		}
+	}
+}

interface.go

@@ -49,7 +49,7 @@ func ListenPacket(network, address string) (net.PacketConn, error) {
 }
 
 // Dial dials the given network and address. see net.Dialer.Dial
-// Returns a net.Conn created from a file discriptor for a socket
+// Returns a net.Conn created from a file descriptor for a socket
 // with SO_REUSEPORT and SO_REUSEADDR option set.
 func Dial(network, laddr, raddr string) (net.Conn, error) {
 	nla, err := ResolveAddr(network, laddr)

old_go_warning.go

@@ -1,6 +1,5 @@
 // +build !go1.11
 
-"go-reuseport requires go >= 1.11"
-
-;
+package reuseport
 
+"go-reuseport requires go >= 1.11";

reuse_test.go

@@ -1,45 +1,65 @@
 package reuseport
 
 import (
-	"context"
-	"net"
-	"strings"
 	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
-func testDialFromListeningPort(t *testing.T, network, host string) {
-	lc := net.ListenConfig{
-		Control: Control,
+var message = "Error %v when attempting to listen to 127.0.0.1"
+
+func TestReusePortFeatureAvailable(t *testing.T) {
+	if ok := Available(); !ok {
+		t.Error("SO_REUSEPORT is not available on this OS")
 	}
-	ctx := context.Background()
-	ll, err := lc.Listen(ctx, network, host+":0")
-	if err != nil && strings.Contains(err.Error(), "cannot assign requested address") {
-		t.Skip(err)
+}
+
+func TestListenOnSamePort(t *testing.T) {
+	l1, err := Listen("tcp", "127.0.0.1:1234")
+	if err != nil {
+		t.Errorf(message+":1234", err)
 	}
-	require.NoError(t, err)
-	rl, err := lc.Listen(ctx, network, host+":0")
-	require.NoError(t, err)
-	d := net.Dialer{
-		LocalAddr: ll.Addr(),
-		Control:   Control,
+	l2, err := Listen("tcp", "127.0.0.1:1234")
+	if err != nil {
+		t.Errorf(message+":1234", err)
 	}
-	c, err := d.Dial(network, rl.Addr().String())
-	require.NoError(t, err)
-	c.Close()
-}
+	l1.Close()
+	l2.Close()
 
-func TestDialFromListeningPort(t *testing.T) {
-	testDialFromListeningPort(t, "tcp", "localhost")
+	lp1, err := ListenPacket("udp", "127.0.0.1:1235")
+	if err != nil {
+		t.Errorf(message+":1234", err)
+	}
+	lp2, err := ListenPacket("udp", "127.0.0.1:1235")
+	if err != nil {
+		t.Errorf(message+":1234", err)
+	}
+	lp1.Close()
+	lp2.Close()
 }
 
-func TestDialFromListeningPortTcp6(t *testing.T) {
-	testDialFromListeningPort(t, "tcp6", "[::1]")
+func TestDialFromSamePort(t *testing.T) {
+	_, err := Listen("tcp", "127.0.0.1:1234")
+	if err != nil {
+		t.Errorf(message+":1234", err)
+	}
+	_, err = Listen("tcp", "127.0.0.1:1235")
+	if err != nil {
+		t.Errorf(message+":1235", err)
+	}
+	c, err := Dial("tcp", "127.0.0.1:1234", "127.0.0.1:1235")
+	if err != nil {
+		t.Errorf("Error %v when attempting to dial from 127.0.0.1:1234 to 127.0.0.1:1235", err)
+	}
+	c.Close()
 }
 
-func TestListenPacketWildcardAddress(t *testing.T) {
-	pc, err := ListenPacket("udp", ":0")
-	require.NoError(t, err)
-	pc.Close()
+func TestErrorWhenDialUnresolvable(t *testing.T) {
+	_, err := Dial("asd", "127.0.0.1:1234", "127.0.0.1:1234")
+	if err == nil {
+		t.Error("Expected error when trying to dial an unknown protocol")
+	}
+
+	_, err = Dial("tcp", "a.b.c.d:1234", "a.b.c.d:1235")
+	if err == nil {
+		t.Error("Expected error when trying to dial an unknown address")
+	}
 }