fixup: Ensure virtuous xfer test checks for ongoing blocks first

Author: maru-ava

tests/e2e/e2e.go

@@ -29,6 +29,10 @@ const (
 	// unlikely to induce flaking due to unexpected resource
 	// contention.
 	DefaultTimeout = 2 * time.Minute
+
+	// Interval appropriate for network operations that should be
+	// retried periodically but not too often.
+	DefaultPollingInterval = 1 * time.Millisecond
 )
 
 // Env is used to access shared test fixture. Intended to be

tests/e2e/x/transfer/virtuous.go

@@ -46,6 +46,23 @@ var _ = e2e.DescribeXChainSerial("[Virtuous Transfer Tx AVAX]", func() {
 		func() {
 			rpcEps := e2e.Env.URIs
 
+			// Waiting for ongoing blocks to have completed before starting this
+			// test avoids the case of a previous test having initiated block
+			// processing but not having completed it.
+			gomega.Eventually(func() bool {
+				allNodeMetrics, err := tests.GetMetricsForNodes(rpcEps, metricBlksProcessing)
+				gomega.Expect(err).Should(gomega.BeNil())
+				for _, metrics := range allNodeMetrics {
+					if metrics[metricBlksProcessing] > 0 {
+						return false
+					}
+				}
+				return true
+			}).
+				WithTimeout(e2e.DefaultTimeout).
+				WithPolling(e2e.DefaultPollingInterval).
+				Should(gomega.BeTrue(), "The cluster is generating ongoing blocks. Is this test being run in parallel?")
+
 			allMetrics := []string{
 				metricBlksProcessing,
 				metricBlksAccepted,
@@ -93,20 +110,10 @@ var _ = e2e.DescribeXChainSerial("[Virtuous Transfer Tx AVAX]", func() {
 					)
 				}
 
-				// URI -> "metric name" -> "metric value"
-				metricsBeforeTx := make(map[string]map[string]float64)
-				for _, u := range rpcEps {
-					ep := u + "/ext/metrics"
-
-					mm, err := tests.GetMetricsValue(ep, allMetrics...)
-					gomega.Expect(err).Should(gomega.BeNil())
-					tests.Outf("{{green}}metrics at %q:{{/}} %v\n", ep, mm)
-
-					if mm[metricBlksProcessing] > 0 {
-						ginkgo.Fail("%s the cluster has already ongoing blocks. Is this test being run in parallel?")
-					}
-
-					metricsBeforeTx[u] = mm
+				metricsBeforeTx, err := tests.GetMetricsForNodes(rpcEps, allMetrics...)
+				gomega.Expect(err).Should(gomega.BeNil())
+				for _, uri := range rpcEps {
+					tests.Outf("{{green}}metrics at %q:{{/}} %v\n", uri, metricsBeforeTx[uri])
 				}
 
 				testBalances := make([]uint64, 0)
@@ -249,8 +256,7 @@ RECEIVER  NEW BALANCE (AFTER) : %21d AVAX
 					gomega.Expect(err).Should(gomega.BeNil())
 					gomega.Expect(status).Should(gomega.Equal(choices.Accepted))
 
-					ep := u + "/ext/metrics"
-					mm, err := tests.GetMetricsValue(ep, allMetrics...)
+					mm, err := tests.GetMetricsForNode(u, allMetrics...)
 					gomega.Expect(err).Should(gomega.BeNil())
 
 					prev := metricsBeforeTx[u]

tests/http.go

@@ -13,6 +13,31 @@ import (
 	"strings"
 )
 
+// "metric name" -> "metric value"
+type NodeMetrics map[string]float64
+
+// URI -> "metric name" -> "metric value"
+type NodesMetrics map[string]NodeMetrics
+
+// GetMetricsForNode retrieves the specified metrics the provided node URI.
+func GetMetricsForNode(nodeURI string, metricNames ...string) (NodeMetrics, error) {
+	uri := nodeURI + "/ext/metrics"
+	return GetMetricsValue(uri, metricNames...)
+}
+
+// GetMetricsForNodes retrieves the specified metrics for the provided node URIs.
+func GetMetricsForNodes(nodeURIs []string, metricNames ...string) (NodesMetrics, error) {
+	metrics := make(NodesMetrics)
+	for _, u := range nodeURIs {
+		var err error
+		metrics[u], err = GetMetricsForNode(u, metricNames...)
+		if err != nil {
+			return nil, fmt.Errorf("failed to retrieve metrics for %s: %w", u, err)
+		}
+	}
+	return metrics, nil
+}
+
 func GetMetricsValue(url string, metrics ...string) (map[string]float64, error) {
 	lines, err := getHTTPLines(url)
 	if err != nil {