diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml index d7c78d1f..e43ceeff 100644 --- a/.github/actions/acc_test/action.yaml +++ b/.github/actions/acc_test/action.yaml @@ -245,12 +245,13 @@ runs: go test -v ${testfile} -timeout=${{ inputs.test_timeout_string }} | tee -a acc_test_run.log set -e - if [[ $(cat acc_test_run.log | grep "FAIL") ]]; then + have_fail=$(cat acc_test_run.log | grep FAIL) + if [[ -n $have_fail ]]; then echo "::endgroup::" echo "::group::go test result" echo "Test failed, see acc_test_run.log for details" - res=$(cat acc_test_run.log | grep -v "=== RUN" | grep -v "\-\-\- PASS" | grep -v "=== CONT" | grep -v "=== PAUSE") - echo "result=FAIL: ${res}" >> "$GITHUB_OUTPUT" + echo "${have_fail}" + echo "result=FAIL:
${have_fail}" >> "$GITHUB_OUTPUT" echo "::endgroup::" exit 1 fi diff --git a/.github/workflows/tf-acc-test.yaml b/.github/workflows/tf-acc-test.yaml index 730fb0ca..91619dde 100644 --- a/.github/workflows/tf-acc-test.yaml +++ b/.github/workflows/tf-acc-test.yaml @@ -16,11 +16,13 @@ on: type: boolean default: false required: true + test_timeout_string: - description: "string that determines the timeout (default: 45m)" + description: "string that determines the timeout (default: '120m')" type: string - default: '90m' + default: '120m' required: true + test_file: description: "string that determines the test file to run (default all tests)" type: choice diff --git a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go index 656b93df..fae56505 100644 --- a/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go +++ b/stackit/internal/services/sqlserverflexbeta/sqlserverflex_acc_test.go @@ -212,7 +212,7 @@ func TestAccInstance(t *testing.T) { PreConfig: func() { t.Logf("testing: %s - %s", t.Name(), "update storage.size and verify") }, - ExpectNonEmptyPlan: true, + ExpectNonEmptyPlan: false, Config: testutils.StringFromTemplateMust( "testdata/instance_template.gompl", updSizeData,