diff --git a/Makefile b/Makefile index c1a27af88de..08dd70872aa 100644 --- a/Makefile +++ b/Makefile @@ -282,7 +282,7 @@ test-e2e: e2e-setup test-e2e-ci # does not do any validation about the state of the Docker environment # As a result, avoid using this locally. test-e2e-ci: - @VERSION=$(VERSION) OSMOSIS_E2E=True OSMOSIS_E2E_DEBUG_LOG=True OSMOSIS_E2E_UPGRADE_VERSION=$(E2E_UPGRADE_VERSION) go test -mod=readonly -timeout=25m -v $(PACKAGES_E2E) + @VERSION=$(VERSION) OSMOSIS_E2E=True OSMOSIS_E2E_DEBUG_LOG=False OSMOSIS_E2E_UPGRADE_VERSION=$(E2E_UPGRADE_VERSION) go test -mod=readonly -timeout=25m -v $(PACKAGES_E2E) # test-e2e-debug runs a full e2e test suite but does # not attempt to delete Docker resources at the end. diff --git a/tests/e2e/containers/containers.go b/tests/e2e/containers/containers.go index 3ce4cf56ac4..de656780b72 100644 --- a/tests/e2e/containers/containers.go +++ b/tests/e2e/containers/containers.go @@ -22,7 +22,7 @@ const ( maxDebugLogsPerCommand = 3 ) -var errRegex = regexp.MustCompile(`(E|e)rror`) +var defaultErrRegex = regexp.MustCompile(`(E|e)rror`) // Manager is a wrapper around all Docker instances, and the Docker API. // It provides utilities to run and interact with all Docker containers used within e2e testing. @@ -125,7 +125,7 @@ func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, // Note that this does not match all errors. // This only works if CLI outpurs "Error" or "error" // to stderr. - if (errRegex.MatchString(errBufString) || m.isDebugLogEnabled) && maxDebugLogTriesLeft > 0 { + if (defaultErrRegex.MatchString(errBufString) || m.isDebugLogEnabled) && maxDebugLogTriesLeft > 0 { t.Log("\nstderr:") t.Log(errBufString) @@ -147,7 +147,8 @@ func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, }, time.Minute, 50*time.Millisecond, - "tx returned a non-zero code", + fmt.Sprintf("success condition (%s) was not met.\nstdout:\n %s\nstderr:\n %s\n", + success, outBuf.String(), errBuf.String()), ) return outBuf, errBuf, nil