From 09aa1009bd39a64aa375d7669613dd37e6997b77 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 08:22:57 -0500
Subject: [PATCH] e2e: constrain test parallelism and reporting (backport
 #7516) (#7517)

* e2e: constrain test parallelism and reporting (#7516)

(cherry picked from commit 386c3a0ff7ce78816253f8e7eea09f98ef61c913)

# Conflicts:
#	test/e2e/tests/app_test.go
#	test/e2e/tests/e2e_test.go

* cleanup tests

Co-authored-by: Sam Kleinman <garen@tychoish.com>
---
 test/e2e/runner/test.go    | 2 +-
 test/e2e/tests/app_test.go | 4 ++--
 test/e2e/tests/e2e_test.go | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go
index ac24b0cd2..0748797aa 100644
--- a/test/e2e/runner/test.go
+++ b/test/e2e/runner/test.go
@@ -15,5 +15,5 @@ func Test(testnet *e2e.Testnet) error {
 		return err
 	}
 
-	return execVerbose("./build/tests", "-test.count", "1")
+	return execVerbose("./build/tests", "-test.count=1", "-test.v")
 }
diff --git a/test/e2e/tests/app_test.go b/test/e2e/tests/app_test.go
index 91f3cd2a5..a6aeded85 100644
--- a/test/e2e/tests/app_test.go
+++ b/test/e2e/tests/app_test.go
@@ -144,10 +144,10 @@ func TestApp_Tx(t *testing.T) {
 			continue
 		}
 		t.Run(test.Name, func(t *testing.T) {
-			// testNode calls t.Parallel as well, so we should
-			// have a copy of the
 			test := testCases[idx]
+			t.Parallel()
 			testNode(t, func(t *testing.T, node e2e.Node) {
+				t.Parallel()
 				client, err := node.Client()
 				require.NoError(t, err)
 
diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go
index a645fd7c1..b1a51d5b8 100644
--- a/test/e2e/tests/e2e_test.go
+++ b/test/e2e/tests/e2e_test.go
@@ -3,6 +3,7 @@ package e2e_test
 import (
 	"context"
 	"os"
+	"sort"
 	"sync"
 	"testing"
 
@@ -47,6 +48,10 @@ func testNode(t *testing.T, testFunc func(*testing.T, e2e.Node)) {
 		node := testnet.LookupNode(name)
 		require.NotNil(t, node, "node %q not found in testnet %q", name, testnet.Name)
 		nodes = []*e2e.Node{node}
+	} else {
+		sort.Slice(nodes, func(i, j int) bool {
+			return nodes[i].Name < nodes[j].Name
+		})
 	}
 
 	for _, node := range nodes {
@@ -57,7 +62,6 @@ func testNode(t *testing.T, testFunc func(*testing.T, e2e.Node)) {
 		}
 
 		t.Run(node.Name, func(t *testing.T) {
-			t.Parallel()
 			testFunc(t, node)
 		})
 	}