bazel: fix some unit tests

This commit is contained in:
Mike Danese 2016-12-15 14:58:49 -08:00
parent 853fcc393e
commit 8fdec87d19
11 changed files with 23 additions and 12 deletions

View File

@ -18,6 +18,10 @@ go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["token_test.go"], srcs = ["token_test.go"],
library = "go_default_library", library = "go_default_library",
tags = ["automanaged"], tags = [
"automanaged",
"integration",
"skip",
],
deps = [], deps = [],
) )

6
pkg/client/testdata/BUILD vendored Normal file
View File

@ -0,0 +1,6 @@
package(default_visibility = ["//visibility:public"])
filegroup(
name = "testdata",
srcs = glob(["*"]),
)

View File

@ -167,7 +167,6 @@ go_test(
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",

View File

@ -54,7 +54,6 @@ go_test(
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",

View File

@ -24,6 +24,7 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
"path/filepath"
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
@ -1179,6 +1180,7 @@ func TestReceiveMultipleErrors(t *testing.T) {
} }
func TestHasNames(t *testing.T) { func TestHasNames(t *testing.T) {
basename := filepath.Base(os.Args[0])
tests := []struct { tests := []struct {
args []string args []string
expectedHasName bool expectedHasName bool
@ -1222,13 +1224,13 @@ func TestHasNames(t *testing.T) {
{ {
args: []string{"rc/foo", "bar"}, args: []string{"rc/foo", "bar"},
expectedHasName: false, expectedHasName: false,
expectedError: fmt.Errorf("there is no need to specify a resource type as a separate argument when passing arguments in resource/name form (e.g. 'resource.test get resource/<resource_name>' instead of 'resource.test get resource resource/<resource_name>'"), expectedError: fmt.Errorf("there is no need to specify a resource type as a separate argument when passing arguments in resource/name form (e.g. '" + basename + " get resource/<resource_name>' instead of '" + basename + " get resource resource/<resource_name>'"),
}, },
} }
for _, test := range tests { for _, test := range tests {
hasNames, err := HasNames(test.args) hasNames, err := HasNames(test.args)
if !reflect.DeepEqual(test.expectedError, err) { if !reflect.DeepEqual(test.expectedError, err) {
t.Errorf("expected HasName to error %v, got %s", test.expectedError, err) t.Errorf("expected HasName to error:\n%s\tgot:\n%s", test.expectedError, err)
} }
if hasNames != test.expectedHasName { if hasNames != test.expectedHasName {
t.Errorf("expected HasName to return %v for %s", test.expectedHasName, test.args) t.Errorf("expected HasName to return %v for %s", test.expectedHasName, test.args)

View File

@ -27,10 +27,10 @@ go_library(
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["kubelet_client_test.go"], srcs = ["kubelet_client_test.go"],
data = ["//pkg/client/testdata"],
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = [ deps = [
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",

View File

@ -96,7 +96,6 @@ go_test(
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",

View File

@ -25,7 +25,6 @@ import (
"path" "path"
"reflect" "reflect"
"regexp" "regexp"
goruntime "runtime"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -1896,8 +1895,7 @@ func TestSeccompLocalhostProfileIsLoaded(t *testing.T) {
recorder := record.NewFakeRecorder(20) recorder := record.NewFakeRecorder(20)
dm.recorder = recorder dm.recorder = recorder
_, filename, _, _ := goruntime.Caller(0) dm.seccompProfileRoot = path.Join("fixtures", "seccomp")
dm.seccompProfileRoot = path.Join(path.Dir(filename), "fixtures", "seccomp")
pod := makePod("foo2", &v1.PodSpec{ pod := makePod("foo2", &v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{

View File

@ -26,10 +26,12 @@ go_library(
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["procfs_linux_test.go"], srcs = ["procfs_linux_test.go"],
data = [
"example_proc_cgroup",
],
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = ["//vendor:github.com/stretchr/testify/assert"], deps = ["//vendor:github.com/stretchr/testify/assert"],
) )

View File

@ -26,6 +26,9 @@ go_library(
go_test( go_test(
name = "go_default_xtest", name = "go_default_xtest",
srcs = ["policy_test.go"], srcs = ["policy_test.go"],
data = glob([
"testdata/*",
]),
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library", "//pkg/api:go_default_library",

View File

@ -21,7 +21,6 @@ go_test(
library = "go_default_library", library = "go_default_library",
tags = [ tags = [
"automanaged", "automanaged",
"skip",
], ],
deps = ["//plugin/pkg/scheduler/factory:go_default_library"], deps = ["//plugin/pkg/scheduler/factory:go_default_library"],
) )