From a98af54d92f3048eed9b27f96bd7601e6ae5ab03 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Mon, 10 Oct 2022 16:42:43 -0600 Subject: [PATCH] Fix some flappers and update Go version for nightly code coverage Signed-off-by: Ivan Kozlovic --- .github/workflows/cov.yaml | 2 +- server/gateway_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cov.yaml b/.github/workflows/cov.yaml index 7923bdf3..8e6a1fa3 100644 --- a/.github/workflows/cov.yaml +++ b/.github/workflows/cov.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.19.x - name: Run code coverage shell: bash --noprofile --norc -x -eo pipefail {0} diff --git a/server/gateway_test.go b/server/gateway_test.go index bd720f6b..e7e1f101 100644 --- a/server/gateway_test.go +++ b/server/gateway_test.go @@ -568,6 +568,8 @@ func TestGatewayHeaderSupport(t *testing.T) { // s1 should have an outbound gateway to s2. waitForOutboundGateways(t, s1, 1, time.Second) + // and an inbound too + waitForInboundGateways(t, s1, 1, time.Second) // s2 should have an inbound gateway waitForInboundGateways(t, s2, 1, time.Second) // and an outbound too @@ -585,6 +587,9 @@ func TestGatewayHeaderSupport(t *testing.T) { t.Fatalf("Error receiving msg from server: %v\n", err) } + // Wait for interest to be registered on s2 + checkGWInterestOnlyModeInterestOn(t, s2, "A", globalAccountName, "foo") + b, _, _ := newClientForServer(s2) defer b.close() @@ -633,6 +638,8 @@ func TestGatewayHeaderDeliverStrippedMsg(t *testing.T) { // s1 should have an outbound gateway to s2. waitForOutboundGateways(t, s1, 1, time.Second) + // and an inbound too + waitForInboundGateways(t, s1, 1, time.Second) // s2 should have an inbound gateway waitForInboundGateways(t, s2, 1, time.Second) // and an outbound too @@ -650,6 +657,9 @@ func TestGatewayHeaderDeliverStrippedMsg(t *testing.T) { t.Fatalf("Error receiving msg from server: %v\n", err) } + // Wait for interest to be registered on s2 + checkGWInterestOnlyModeInterestOn(t, s2, "A", globalAccountName, "foo") + b, _, _ := newClientForServer(s2) defer b.close()