From 03cf37e7b8e403cc32a61ece6a3c16863b82da97 Mon Sep 17 00:00:00 2001 From: Ronald Date: Mon, 17 Jul 2023 14:11:19 -0400 Subject: [PATCH] Re-order expected/actual for assertContainerState in consul container tests (#18157) Re-order expected/actual, consul container tests --- GNUmakefile | 2 +- test/integration/consul-container/libs/assert/service.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 79080311c4..a7c304c5a1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -54,7 +54,7 @@ QUIET= endif ifeq ("$(GOTAGS)","") -CONSUL_COMPAT_TEST_IMAGE=consul +CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul else CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise endif diff --git a/test/integration/consul-container/libs/assert/service.go b/test/integration/consul-container/libs/assert/service.go index 370fbc857d..c0a8197ff3 100644 --- a/test/integration/consul-container/libs/assert/service.go +++ b/test/integration/consul-container/libs/assert/service.go @@ -252,5 +252,5 @@ func AssertFortioNameWithClient(t *testing.T, urlbase string, name string, reqHo func AssertContainerState(t *testing.T, service libservice.Service, state string) { containerStatus, err := service.GetStatus() require.NoError(t, err) - require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", containerStatus, state)) + require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", state, containerStatus)) }