backport of commit d5bed27

hashicorp · Jul 17, 2023 · 1909c21 · 1909c21
1 parent fedb250
commit 1909c21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -53,7 +53,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
@@ -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))
 }