github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

*_test.go: fix test conditions

Browse Source 
- add `testutil.RequiresRoot()` to TestMain
- moved `if testing.Short{ t.Skip() }` from each of the tests into a
common `newClient()`

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-06-29 06:37:33 +00:00
parent 8a00710af8
commit eeb74d4e23
6 changed files with 46 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -121,15 +121,15 @@ test: ## run tests, except integration tests and tests that require root
root-test: ## run tests, except integration tests root-test: ## run tests, except integration tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go test ${TESTFLAGS} ${TEST_REQUIRES_ROOT_PACKAGES} -test.root @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root
integration: ## run integration tests integration: ## run integration tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go test ${TESTFLAGS} @go test ${TESTFLAGS} -test.root
benchmark: ## run benchmarks tests benchmark: ## run benchmarks tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@go test ${TESTFLAGS} -bench . -run Benchmark @go test ${TESTFLAGS} -bench . -run Benchmark -test.root
FORCE: FORCE:
@ -173,14 +173,14 @@ coverage: ## generate coverprofiles from the unit tests, except tests that requi
root-coverage: ## generae coverage profiles for the unit tests root-coverage: ## generae coverage profiles for the unit tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@( for pkg in ${TEST_REQUIRES_ROOT_PACKAGES}; do \ @( for pkg in $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}); do \
go test -i ${TESTFLAGS} -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg -test.root || exit; \ go test -i ${TESTFLAGS} -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg -test.root || exit; \
go test ${TESTFLAGS} -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg -test.root || exit; \ go test ${TESTFLAGS} -test.short -coverprofile="../../../$$pkg/coverage.txt" -covermode=atomic $$pkg -test.root || exit; \
done ) done )
coverage-integration: ## generate coverprofiles from the integration tests coverage-integration: ## generate coverprofiles from the integration tests
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
go test ${TESTFLAGS} -test.short -coverprofile="../../../${INTEGRATION_PACKAGE}/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} go test ${TESTFLAGS} -test.short -coverprofile="../../../${INTEGRATION_PACKAGE}/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} -test.root
vendor: vendor:
@echo "$(WHALE) $@" @echo "$(WHALE) $@"

10
benchmark_test.go
View File

@ -6,10 +6,7 @@ import (
) )
func BenchmarkContainerCreate(b *testing.B) { func BenchmarkContainerCreate(b *testing.B) {
if testing.Short() { client, err := newClient(b, address)
b.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }
@ -52,10 +49,7 @@ func BenchmarkContainerCreate(b *testing.B) {
} }
func BenchmarkContainerStart(b *testing.B) { func BenchmarkContainerStart(b *testing.B) {
if testing.Short() { client, err := newClient(b, address)
b.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }

10
checkpoint_test.go
View File

@ -6,13 +6,10 @@ import (
) )
func TestCheckpointRestore(t *testing.T) { func TestCheckpointRestore(t *testing.T) {
if testing.Short() {
t.Skip()
}
if !supportsCriu { if !supportsCriu {
t.Skip("system does not have criu installed") t.Skip("system does not have criu installed")
} }
client, err := New(address) client, err := newClient(t, address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -101,13 +98,10 @@ func TestCheckpointRestore(t *testing.T) {
} }
func TestCheckpointRestoreNewContainer(t *testing.T) { func TestCheckpointRestoreNewContainer(t *testing.T) {
if testing.Short() {
t.Skip()
}
if !supportsCriu { if !supportsCriu {
t.Skip("system does not have criu installed") t.Skip("system does not have criu installed")
} }
client, err := New(address) client, err := newClient(t, address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

22
client_test.go
View File

@ -12,6 +12,7 @@ import (
"time" "time"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/testutil"
) )
const ( const (
@ -41,7 +42,7 @@ func TestMain(m *testing.M) {
if testing.Short() { if testing.Short() {
os.Exit(m.Run()) os.Exit(m.Run())
} }
testutil.RequiresRootM()
// check if criu is installed on the system // check if criu is installed on the system
_, err := exec.LookPath("criu") _, err := exec.LookPath("criu")
supportsCriu = err == nil supportsCriu = err == nil
@ -134,11 +135,16 @@ func waitForDaemonStart(ctx context.Context, address string) (*Client, error) {
return nil, fmt.Errorf("containerd did not start within 2s: %v", err) return nil, fmt.Errorf("containerd did not start within 2s: %v", err)
} }
func TestNewClient(t *testing.T) { func newClient(t testing.TB, address string, opts ...ClientOpt) (*Client, error) {
if testing.Short() { if testing.Short() {
t.Skip() t.Skip()
} }
client, err := New(address) // testutil.RequiresRoot(t) is not needed here (already called in TestMain)
return New(address, opts...)
}
func TestNewClient(t *testing.T) {
client, err := newClient(t, address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -151,18 +157,14 @@ func TestNewClient(t *testing.T) {
} }
func TestImagePull(t *testing.T) { func TestImagePull(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
ctx, cancel := testContext()
defer cancel()
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer client.Close() defer client.Close()
ctx, cancel := testContext()
defer cancel()
_, err = client.Pull(ctx, testImage) _, err = client.Pull(ctx, testImage)
if err != nil { if err != nil {
t.Error(err) t.Error(err)

55
container_test.go
View File

@ -20,10 +20,7 @@ func empty() IOCreation {
} }
func TestContainerList(t *testing.T) { func TestContainerList(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -43,11 +40,8 @@ func TestContainerList(t *testing.T) {
} }
func TestNewContainer(t *testing.T) { func TestNewContainer(t *testing.T) {
if testing.Short() {
t.Skip()
}
id := t.Name() id := t.Name()
client, err := New(address) client, err := newClient(t, address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -82,10 +76,7 @@ func TestNewContainer(t *testing.T) {
} }
func TestContainerStart(t *testing.T) { func TestContainerStart(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -152,10 +143,7 @@ func TestContainerStart(t *testing.T) {
} }
func TestContainerOutput(t *testing.T) { func TestContainerOutput(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -225,10 +213,7 @@ func TestContainerOutput(t *testing.T) {
} }
func TestContainerExec(t *testing.T) { func TestContainerExec(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -320,10 +305,7 @@ func TestContainerExec(t *testing.T) {
} }
func TestContainerProcesses(t *testing.T) { func TestContainerProcesses(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -393,10 +375,7 @@ func TestContainerProcesses(t *testing.T) {
} }
func TestContainerCloseIO(t *testing.T) { func TestContainerCloseIO(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -477,10 +456,7 @@ func TestContainerCloseIO(t *testing.T) {
} }
func TestContainerAttach(t *testing.T) { func TestContainerAttach(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -602,10 +578,7 @@ func TestContainerAttach(t *testing.T) {
} }
func TestDeleteRunningContainer(t *testing.T) { func TestDeleteRunningContainer(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -670,10 +643,7 @@ func TestDeleteRunningContainer(t *testing.T) {
} }
func TestContainerKill(t *testing.T) { func TestContainerKill(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -739,10 +709,7 @@ func TestContainerKill(t *testing.T) {
} }
func TestContainerUpdate(t *testing.T) { func TestContainerUpdate(t *testing.T) {
if testing.Short() { client, err := newClient(t, address)
t.Skip()
}
client, err := New(address)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

15
testutil/helpers.go
View File

@ -2,6 +2,7 @@ package testutil
import ( import (
"flag" "flag"
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -28,7 +29,7 @@ func Unmount(t *testing.T, mountPoint string) {
// RequiresRoot skips tests that require root, unless the test.root flag has // RequiresRoot skips tests that require root, unless the test.root flag has
// been set // been set
func RequiresRoot(t *testing.T) { func RequiresRoot(t testing.TB) {
if !rootEnabled { if !rootEnabled {
t.Skip("skipping test that requires root") t.Skip("skipping test that requires root")
return return
@ -36,6 +37,18 @@ func RequiresRoot(t *testing.T) {
assert.Equal(t, 0, os.Getuid(), "This test must be run as root.") assert.Equal(t, 0, os.Getuid(), "This test must be run as root.")
} }
// RequiresRootM is similar to RequiresRoot but intended to be called from *testing.M.
func RequiresRootM() {
if !rootEnabled {
fmt.Fprintln(os.Stderr, "skipping test that requires root")
os.Exit(0)
}
if 0 != os.Getuid() {
fmt.Fprintln(os.Stderr, "This test must be run as root.")
os.Exit(1)
}
}
// DumpDir will log out all of the contents of the provided directory to // DumpDir will log out all of the contents of the provided directory to
// testing logger. // testing logger.
// //