Tidy code.

mailgun · Mar 8, 2024 · f00d4e2 · f00d4e2
1 parent 38b0f79
commit f00d4e2
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/functional_test.go b/functional_test.go
@@ -1497,8 +1497,6 @@ func TestGlobalBehavior(t *testing.T) {
 				upgCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_grpc_request_duration_count{method=\"/pb.gubernator.PeersV1/UpdatePeerGlobals\"}")
 				gprlCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_grpc_request_duration_count{method=\"/pb.gubernator.PeersV1/GetPeerRateLimits\"}")
 
-				require.NoError(t, waitForIdle(1*clock.Minute, cluster.GetDaemons()...))
-
 				// When
 				for i := int64(0); i < testCase.Hits; i++ {
 					sendHit(t, owner, makeReq(name, key, 1), guber.Status_UNDER_LIMIT, 999-i)
@@ -1610,13 +1608,13 @@ func TestGlobalBehavior(t *testing.T) {
 				require.NoError(t, err)
 				t.Logf("Owner peer: %s", owner.InstanceID)
 
+				require.NoError(t, waitForIdle(1*clock.Minute, cluster.GetDaemons()...))
+
 				broadcastCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_broadcast_duration_count")
 				updateCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_global_send_duration_count")
 				upgCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_grpc_request_duration_count{method=\"/pb.gubernator.PeersV1/UpdatePeerGlobals\"}")
 				gprlCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_grpc_request_duration_count{method=\"/pb.gubernator.PeersV1/GetPeerRateLimits\"}")
 
-				require.NoError(t, waitForIdle(1*clock.Minute, cluster.GetDaemons()...))
-
 				// When
 				for i := int64(0); i < testCase.Hits; i++ {
 					sendHit(t, peers[0], makeReq(name, key, 1), guber.Status_UNDER_LIMIT, 999-i)
@@ -1739,6 +1737,8 @@ func TestGlobalBehavior(t *testing.T) {
 				}
 				t.Logf("Owner peer: %s", owner.InstanceID)
 
+				require.NoError(t, waitForIdle(1*clock.Minute, cluster.GetDaemons()...))
+
 				broadcastCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_broadcast_duration_count")
 				updateCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_global_send_duration_count")
 				upgCounters := getPeerCounters(t, cluster.GetDaemons(), "gubernator_grpc_request_duration_count{method=\"/pb.gubernator.PeersV1/UpdatePeerGlobals\"}")
@@ -1747,8 +1747,6 @@ func TestGlobalBehavior(t *testing.T) {
 				var wg sync.WaitGroup
 				var mutex sync.Mutex
 
-				require.NoError(t, waitForIdle(1*clock.Minute, cluster.GetDaemons()...))
-
 				// When
 				wg.Add(testCase.Hits)
 				for i := 0; i < testCase.Hits; i++ {