hack: have integration-cli use gotestsum codepath
@@ -47,16 +47,17 @@ integration_api_dirs="${TEST_INTEGRATION_DIR:-$(go list -test -f '{{- if ne .Fo
run_test_integration() {
set_platform_timeout
if [ -z "${TEST_SKIP_INTEGRATION}" ]; then
- run_test_integration_suites
+ run_test_integration_suites "${integration_api_dirs}"
fi
if [ -z "${TEST_SKIP_INTEGRATION_CLI}" ]; then
- run_test_integration_legacy_suites
+ TIMEOUT=360m run_test_integration_suites integration-cli
fi
}
run_test_integration_suites() {
local flags="-test.v -test.timeout=${TIMEOUT} $TESTFLAGS"
- for dir in ${integration_api_dirs}; do
+ local dirs="$1"
+ for dir in ${dirs}; do
if ! (
cd "$dir"
# Create a useful package name based on the tests's $dir. We need to take
@@ -84,16 +85,6 @@ run_test_integration_suites() {
done
}
-run_test_integration_legacy_suites() {
- (
- flags="-test.v -test.timeout=360m $TESTFLAGS"
- cd integration-cli
- echo "Running $PWD flags=${flags}"
- # shellcheck disable=SC2086
- test_env ./test.main $flags
- )
-}
-
build_test_suite_binaries() {
if [ -n "${DOCKER_INTEGRATION_TESTS_VERIFIED}" ]; then
echo "Skipping building test binaries; as DOCKER_INTEGRATION_TESTS_VERIFIED is set"
