Skip to content

Commit 440146d

Browse files
Fix timeout
Fix timeout no longer being consumed from `TESTCASE_TIMEOUT` env var and instead use `--timeout` flag.
1 parent 873127b commit 440146d

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

.github/workflows/oats.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ jobs:
3939
run: go install "github.com/grafana/oats@${OATS_VERSION}"
4040

4141
- name: Run acceptance tests
42-
env:
43-
TESTCASE_BASE_PATH: './docker'
44-
TESTCASE_SKIP_BUILD: true
45-
TESTCASE_TIMEOUT: 5m
46-
run: oats ./docker/docker-compose-aspnetcore
42+
run: oats --timeout=5m ./docker/docker-compose-aspnetcore
4743

4844
- name: Upload log file
4945
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

scripts/run-oats-tests.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ $ProgressPreference = "SilentlyContinue"
77
# TODO Pin to specific version and then update with renovate
88
${env:OATS_VERSION}="173ac1f6a190c2ffd156a98dfe923c70a2a0c3ca"
99

10-
${env:TESTCASE_SKIP_BUILD}="true"
11-
${env:TESTCASE_TIMEOUT}="5m"
12-
${env:TESTCASE_BASE_PATH}="./docker"
13-
1410
go install "github.com/grafana/oats@${env:OATS_VERSION}"
15-
& "${env:GOPATH}/bin/oats" ./docker/docker-compose-aspnetcore
11+
& "${env:GOPATH}/bin/oats" --timeout=5m ./docker/docker-compose-aspnetcore

scripts/run-oats-tests.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,5 @@ set -euo pipefail
55
# TODO Pin to specific version and then update with renovate
66
export OATS_VERSION=latest
77

8-
export TESTCASE_SKIP_BUILD=true
9-
export TESTCASE_TIMEOUT=5m
10-
export TESTCASE_BASE_PATH=./docker
11-
128
go install "github.com/grafana/oats@${OATS_VERSION}"
13-
${GOPATH}/bin/oats ./docker/docker-compose-aspnetcore
9+
${GOPATH}/bin/oats --timeout=5m ./docker/docker-compose-aspnetcore

0 commit comments

Comments
 (0)