Try to fix route group test conn

skycoin · Jan 29, 2020 · 61c8b8a · 61c8b8a
1 parent 1d03580
commit 61c8b8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/router/route_group_test.go b/pkg/router/route_group_test.go
@@ -3,8 +3,10 @@ package router
 import (
 	"context"
 	"fmt"
+	"golang.org/x/net/nettest"
 	"io"
 	"math/rand"
+	"net"
 	"strconv"
 	"strings"
 	"sync"
@@ -680,7 +682,7 @@ func TestRouteGroup_RemoteAddr(t *testing.T) {
 }
 
 // TODO (Darkren): uncomment and fix
-/*func TestRouteGroup_TestConn(t *testing.T) {
+func TestRouteGroup_TestConn(t *testing.T) {
 	mp := func() (c1, c2 net.Conn, stop func(), err error) {
 		keys := snettest.GenKeyPairs(2)
 
@@ -740,15 +742,15 @@ func TestRouteGroup_RemoteAddr(t *testing.T) {
 			if err := rg1.Close(); err != nil {
 				//panic(err)
 			}
-			nEnv.Teardown()
 			cancel()
+			nEnv.Teardown()
 		}
 
 		return rg0, rg1, stop, nil
 	}
 
 	nettest.TestConn(t, mp)
-}*/
+}
 
 func pushPackets(ctx context.Context, from *transport.Manager, to *RouteGroup) {
 	for {

diff --git a/vendor/golang.org/x/net/nettest/conntest.go b/vendor/golang.org/x/net/nettest/conntest.go