luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Backport of Re-order expected/actual for assertContainerState in consul container tests into release/1.16.x (#18158) 

backport of commit d5bed27d980058151d884980ad70071c8f235f37

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
This commit is contained in:
hc-github-team-consul-core 2023-07-17 13:29:36 -05:00 committed by GitHub
parent 788225832e
commit bb0c534363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -53,7 +53,7 @@ QUIET=
endif endif
ifeq ("$(GOTAGS)","") ifeq ("$(GOTAGS)","")
CONSUL_COMPAT_TEST_IMAGE=consul CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul
else else
CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise
endif endif

2
test/integration/consul-container/libs/assert/service.go
View File

@ -252,5 +252,5 @@ func AssertFortioNameWithClient(t *testing.T, urlbase string, name string, reqHo
func AssertContainerState(t *testing.T, service libservice.Service, state string) { func AssertContainerState(t *testing.T, service libservice.Service, state string) {
containerStatus, err := service.GetStatus() containerStatus, err := service.GetStatus()
require.NoError(t, err) 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))
} }