Revert to previous testing logic

go.mod

@@ -3,7 +3,6 @@ module github.com/vishvananda/netlink
 go 1.12
 
 require (
-	github.com/stretchr/testify v1.8.4
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
 	golang.org/x/sys v0.10.0
 )

go.sum

@@ -1,22 +1,5 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

socket_test.go

@@ -4,62 +4,90 @@
 package netlink
 
 import (
+	"log"
 	"net"
 	"os/user"
 	"strconv"
 	"syscall"
 	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestSocketGet(t *testing.T) {
 	defer setUpNetlinkTestWithLoopback(t)()
 
 	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	require.NoError(t, err)
-
+	if err != nil {
+		log.Fatal(err)
+	}
 	l, err := net.ListenTCP("tcp", addr)
-	require.NoError(t, err)
+	if err != nil {
+		log.Fatal(err)
+	}
 	defer l.Close()
 
 	conn, err := net.Dial(l.Addr().Network(), l.Addr().String())
-	require.NoError(t, err)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer conn.Close()
 
 	localAddr := conn.LocalAddr().(*net.TCPAddr)
 	remoteAddr := conn.RemoteAddr().(*net.TCPAddr)
 	socket, err := SocketGet(localAddr, remoteAddr)
-	require.NoError(t, err)
-
-	require.EqualValues(t, localAddr.IP.To16(), socket.ID.Source.To16(), "local ip")
-	require.EqualValues(t, remoteAddr.IP.To16(), socket.ID.Destination.To16(), "remote ip")
-	require.EqualValues(t, localAddr.Port, socket.ID.SourcePort, "local port")
-	require.EqualValues(t, remoteAddr.Port, socket.ID.DestinationPort, "remote port")
+	if err != nil {
+		t.Fatal(err)
+	}
 
+	if got, want := socket.ID.Source, localAddr.IP; !got.Equal(want) {
+		t.Fatalf("local ip = %v, want %v", got, want)
+	}
+	if got, want := socket.ID.Destination, remoteAddr.IP; !got.Equal(want) {
+		t.Fatalf("remote ip = %v, want %v", got, want)
+	}
+	if got, want := int(socket.ID.SourcePort), localAddr.Port; got != want {
+		t.Fatalf("local port = %d, want %d", got, want)
+	}
+	if got, want := int(socket.ID.DestinationPort), remoteAddr.Port; got != want {
+		t.Fatalf("remote port = %d, want %d", got, want)
+	}
 	u, err := user.Current()
-	require.NoError(t, err)
-	require.EqualValues(t, u.Uid, strconv.Itoa(int(socket.UID)), "UID")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got, want := strconv.Itoa(int(socket.UID)), u.Uid; got != want {
+		t.Fatalf("UID = %s, want %s", got, want)
+	}
 }
 
 func TestSocketDiagTCPInfo(t *testing.T) {
-	for _, expected := range []uint8{syscall.AF_INET, syscall.AF_INET6} {
-		result, err := SocketDiagTCPInfo(expected)
-		require.NoError(t, err)
-
-		for _, i := range result {
-			require.Equal(t, expected, i.InetDiagMsg.Family)
+	Family4 := uint8(syscall.AF_INET)
+	Family6 := uint8(syscall.AF_INET6)
+	families := []uint8{Family4, Family6}
+	for _, wantFamily := range families {
+		res, err := SocketDiagTCPInfo(wantFamily)
+		if err != nil {
+			t.Fatal(err)
+		}
+		for _, i := range res {
+			gotFamily := i.InetDiagMsg.Family
+			if gotFamily != wantFamily {
+				t.Fatalf("Socket family = %d, want %d", gotFamily, wantFamily)
+			}
 		}
 	}
 }
 
 func TestSocketDiagUDPnfo(t *testing.T) {
-	for _, expected := range []uint8{syscall.AF_INET, syscall.AF_INET6} {
-		result, err := SocketDiagUDPInfo(expected)
-		require.NoError(t, err)
+	for _, want := range []uint8{syscall.AF_INET, syscall.AF_INET6} {
+		result, err := SocketDiagUDPInfo(want)
+		if err != nil {
+			t.Fatal(err)
+		}
 
-		for _, i := range result {
-			require.Equal(t, expected, i.InetDiagMsg.Family)
+		for _, r := range result {
+			if got := r.InetDiagMsg.Family; got != want {
+				t.Fatalf("protocol family = %v, want %v", got, want)
+			}
 		}
 	}
 }