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

Jump to bottom

*: make unit tests more %check-friendly #65

Merged
merged 2 commits into from
Dec 20, 2016
Merged

*: make unit tests more %check-friendly #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14526d3
makefile: make local-unit-tests work as root and non-root
cyphar Dec 20, 2016
d1df1be
makefile: improve testing and building
cyphar Dec 20, 2016
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO

GO_SRC = $(shell find . -name \*.go)
umoci: $(GO_SRC)
$(GO) build -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/umoci
$(GO) build -ldflags "-s -w -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/umoci

umoci.static: $(GO_SRC)
CGO_ENABLED=0 $(GO) build -ldflags "-extldflags '-static' -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/umoci
CGO_ENABLED=0 $(GO) build -ldflags "-s -w -extldflags '-static' -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/cmd/umoci

.PHONY: update-deps
update-deps:
Expand Down Expand Up @@ -82,11 +82,11 @@ umociimage:
.PHONY: test-unit
test-unit: umociimage
docker run --rm -it -v $(PWD):/go/src/$(PROJECT) --cap-add=SYS_ADMIN $(UMOCI_IMAGE) make local-test-unit
docker run --rm -it -v $(PWD):/go/src/$(PROJECT) -u 1000:1000 --cap-drop=all $(UMOCI_IMAGE) go test -v $(PROJECT)/pkg/unpriv
docker run --rm -it -v $(PWD):/go/src/$(PROJECT) -u 1000:1000 --cap-drop=all $(UMOCI_IMAGE) make local-test-unit

.PHONY: local-test-unit
local-test-unit: umoci
go test -v $(PROJECT)/...
go test -cover -v $(PROJECT)/...

.PHONY: test-integration
test-integration: umociimage
Expand Down
10 changes: 10 additions & 0 deletions oci/cas/dir_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ import (

// readonly makes the given path read-only (by bind-mounting it as "ro").
func readonly(t *testing.T, path string) {
if os.Geteuid() != 0 {
t.Log("readonly tests only work with root privileges")
t.Skip()
}

t.Logf("mounting %s as readonly", path)

if err := syscall.Mount(path, path, "", syscall.MS_BIND|syscall.MS_RDONLY, ""); err != nil {
Expand All @@ -52,6 +57,11 @@ func readonly(t *testing.T, path string) {

// readwrite undoes the effect of readonly.
func readwrite(t *testing.T, path string) {
if os.Geteuid() != 0 {
t.Log("readonly tests only work with root privileges")
t.Skip()
}

if err := syscall.Unmount(path, syscall.MNT_DETACH); err != nil {
t.Fatalf("unmount %s: %s", path, err)
}
Expand Down
5 changes: 5 additions & 0 deletions oci/layer/tar_extract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,11 @@ func TestUnpackHardlink(t *testing.T) {

// TestUnpackEntryMap checks that the mapOptions handling works.
func TestUnpackEntryMap(t *testing.T) {
if os.Geteuid() != 0 {
t.Log("mapOptions tests only work with root privileges")
t.Skip()
}

// TODO: Modify this to use subtests once Go 1.7 is in enough places.
func(t *testing.T) {
for _, test := range []struct {
Expand Down