github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74735 from liggitt/simplfy-package-test 

Simplify package skipping test
pull/564/head
Kubernetes Prow Robot 2019-02-28 14:46:30 -08:00 committed by GitHub
parent 0d7eb7006f 1676a49d8c
commit ae561229a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
staging/src/k8s.io/apimachinery/pkg/util/naming/from_stack_test.go
View File

@ -16,7 +16,10 @@ limitations under the License.
package naming package naming
import "testing" import (
"strings"
"testing"
)
func TestGetNameFromCallsite(t *testing.T) { func TestGetNameFromCallsite(t *testing.T) {
tests := []struct { tests := []struct {
@ -26,17 +29,17 @@ func TestGetNameFromCallsite(t *testing.T) {
}{ }{
{ {
name: "simple", name: "simple",
expected: "k8s.io/apimachinery/pkg/util/naming/from_stack_test.go:50", expected: "k8s.io/apimachinery/pkg/util/naming/from_stack_test.go:",
}, },
{ {
name: "ignore-package", name: "ignore-package",
ignoredPackages: []string{"k8s.io/apimachinery/pkg/util/naming"}, ignoredPackages: []string{"k8s.io/apimachinery/pkg/util/naming"},
expected: "testing/testing.go:827", expected: "testing/testing.go:",
}, },
{ {
name: "ignore-file", name: "ignore-file",
ignoredPackages: []string{"k8s.io/apimachinery/pkg/util/naming/from_stack_test.go"}, ignoredPackages: []string{"k8s.io/apimachinery/pkg/util/naming/from_stack_test.go"},
expected: "testing/testing.go:827", expected: "testing/testing.go:",
}, },
{ {
name: "ignore-multiple", name: "ignore-multiple",
@ -48,8 +51,8 @@ func TestGetNameFromCallsite(t *testing.T) {
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
actual := GetNameFromCallsite(tc.ignoredPackages...) actual := GetNameFromCallsite(tc.ignoredPackages...)
if tc.expected != actual { if !strings.HasPrefix(actual, tc.expected) {
t.Fatalf("expected %q, got %q", tc.expected, actual) t.Fatalf("expected string with prefix %q, got %q", tc.expected, actual)
} }
}) })
} }