Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: increase timeout for unit tests #14876

Merged
merged 4 commits into from
Jan 8, 2025
Merged

tests: increase timeout for unit tests #14876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad9651f
tests: increase timeout for unit tests on focal
maykathm Dec 18, 2024
d476835
tests: scale back timeout for settle
maykathm Dec 19, 2024
37626be
tests: changed go unit test timeout to 15m for all systems
maykathm Dec 19, 2024
3a2a1ed
tests: changed default timeout to 15m and removed parameter from test…
maykathm Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion overlord/snapstate/snapstate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (s *snapmgrBaseTest) settle(c *C) {
s.state.Unlock()
defer s.state.Lock()

err := s.o.Settle(testutil.HostScaledTimeout(5 * time.Second))
err := s.o.Settle(testutil.HostScaledTimeout(15 * time.Second))
maykathm marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
s.state.Lock()
defer s.state.Unlock()
Expand Down
5 changes: 3 additions & 2 deletions run-checks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ COVERMODE=${COVERMODE:-atomic}
COVERAGE_SUFFIX=${GO_BUILD_TAGS:-notags}
COVERAGE_OUT=${COVERAGE_OUT:-.coverage/coverage-$COVERAGE_SUFFIX.cov}
CHANGED_FILES=${CHANGED_FILES:-""}
TIMEOUT=${TIMEOUT:-5}

if [ -z "${GITHUB_WORKFLOW:-}" ]; then
# when *not* running inside github, ensure we use go-1.18 by default
Expand Down Expand Up @@ -434,15 +435,15 @@ if [ "$UNIT" = 1 ]; then

tags=
race=
timeout="5m"
timeout="${TIMEOUT}m"
if [ -n "${GO_BUILD_TAGS:-}" ]; then
echo "Using build tags: $GO_BUILD_TAGS"
tags="-tags $GO_BUILD_TAGS"
fi
if [ -n "${GO_TEST_RACE:-}" ]; then
echo "Using go test -race"
race="-race"
timeout="10m"
timeout="$((TIMEOUT*2))m"
fi

echo Building
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/go/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ execute: |
PROXY_PARAM="$PROXY_PARAM HTTPS_PROXY=$https_proxy"
fi

TIMEOUT=""
if os.query is-focal; then
TIMEOUT=15
fi

if not os.query is-trusty; then
if [ "$VARIANT" = "static" ] ; then
tests.session -u test exec sh -c "cd /tmp/static-unit-tests/src/github.com/snapcore/snapd && \
Expand All @@ -84,6 +89,7 @@ execute: |
$PROXY_PARAM \
SKIP_COVERAGE=1 \
CC=$VARIANT \
TIMEOUT=$TIMEOUT \
./run-checks --unit"
fi
else
Expand Down Expand Up @@ -119,6 +125,7 @@ execute: |
$PROXY_PARAM \
SKIP_COVERAGE=1 \
CC=$VARIANT \
TIMEOUT=$TIMEOUT \
./run-checks --unit" test
fi
fi
Loading