e2e: reactivate network test (backport #8635) (#8777)

test/e2e/runner/test.go

@@ -15,5 +15,5 @@ func Test(testnet *e2e.Testnet) error {
 		return err
 	}
 
-	return execVerbose("./build/tests", "-test.count=1", "-test.v")
+	return execVerbose("./build/tests", "-test.count=1")
 }

test/e2e/tests/net_test.go

@@ -6,33 +6,40 @@ import (
 	"github.com/stretchr/testify/require"
 
 	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
+	"github.com/tendermint/tendermint/types"
 )
 
 // Tests that all nodes have peered with each other, regardless of discovery method.
 func TestNet_Peers(t *testing.T) {
-	// FIXME Skip test since nodes aren't always able to fully mesh
-	t.SkipNow()
-
 	testNode(t, func(t *testing.T, node e2e.Node) {
 		client, err := node.Client()
 		require.NoError(t, err)
 		netInfo, err := client.NetInfo(ctx)
 		require.NoError(t, err)
 
-		require.Equal(t, len(node.Testnet.Nodes)-1, netInfo.NPeers,
-			"node is not fully meshed with peers")
-
+		expectedPeers := len(node.Testnet.Nodes)
+		peers := make(map[string]*e2e.Node, 0)
 		seen := map[string]bool{}
 		for _, n := range node.Testnet.Nodes {
-			seen[n.Name] = (n.Name == node.Name) // we've clearly seen ourself
+			// we never save light client addresses as they use RPC or ourselves
+			if n.Mode == e2e.ModeLight || n.Name == node.Name {
+				expectedPeers--
+				continue
+			}
+			peers[string(types.NodeIDFromPubKey(n.NodeKey.PubKey()))] = n
+			seen[n.Name] = false
 		}
+
+		require.Equal(t, expectedPeers, netInfo.NPeers,
+			"node is not fully meshed with peers")
+
 		for _, peerInfo := range netInfo.Peers {
-			id := peerInfo.ID
-			peer := node.Testnet.LookupNode(string(id))
-			require.NotNil(t, peer, "unknown node %v", id)
+			id := string(peerInfo.ID)
+			peer, ok := peers[id]
+			require.True(t, ok, "unknown node %v", id)
 			require.Contains(t, peerInfo.URL, peer.IP.String(),
 				"unexpected IP address for peer %v", id)
-			seen[string(id)] = true
+			seen[peer.Name] = true
 		}
 
 		for name := range seen {