containers
/
image
mirror of https://github.com/containers/image.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restrict the root-only tests to ./storage 

The filter already assumes that subpackage, by grepping
for a package-private function name, anyway.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2025-07-07 17:30:40 +02:00
parent 8b4bc50986
commit f5c53d5e72
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -15,6 +15,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)"
# Extra flags passed to go test
TESTFLAGS :=
TEST_PACKAGES := ./...
PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
@ -89,7 +90,7 @@ clean:
.PHONY: test
test:
@go test $(BUILDFLAGS) $(TESTFLAGS) -cover ./...
@go test $(BUILDFLAGS) $(TESTFLAGS) -cover $(TEST_PACKAGES)
.PHONY: fmt
fmt:

4
contrib/cirrus/runner.sh
View File

@ -57,10 +57,10 @@ _run_image_tests() {
# actually need to be root.
# Note we must run git before we switch/chown to the user because it will error
# out otherwise since the file ownership doesn't match.
test_filter=$(git grep -h --show-function ensureTestCanCreateImages |
test_filter=$(git grep -h --show-function ensureTestCanCreateImages ./storage |
sed -n 's/func \(Test[[:alnum:]]*\)(.*/^\1\$\$/p' |
paste -sd "|" -)
showrun make test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v -run '$test_filter'"
showrun make test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v -run '$test_filter'" TEST_PACKAGES=./storage
# Most tests in this repo are intended to run as a regular user.
ROOTLESS_USER="testuser$RANDOM"