github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40594 from deads2k/restore-testing

Browse Source 
Restore unit testing for staging repos
This commit is contained in:
Wojciech Tyczynski 2017-01-27 15:55:35 +01:00 committed by GitHub
commit abed746172
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/test-dockerized.sh
View File

@ -55,6 +55,8 @@ make generated_files
go install ./cmd/... go install ./cmd/...
./hack/install-etcd.sh ./hack/install-etcd.sh
# bazel didn't like BUILD files in the staging repos, so we need to run unit tests
make test WHAT="./vendor/k8s.io/apimachinery/... ./vendor/k8s.io/apiserver/... ./vendor/k8s.io/client-go/..."
make test-cmd make test-cmd
make test-integration make test-integration
./hack/test-update-storage-objects.sh ./hack/test-update-storage-objects.sh

2
staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go
View File

@ -141,7 +141,7 @@ stuff: 1
t.Fatal("expected error with yaml: violate, got no error") t.Fatal("expected error with yaml: violate, got no error")
} }
fmt.Printf("err: %s\n", err.Error()) fmt.Printf("err: %s\n", err.Error())
if !strings.HasPrefix(err.Error(), "yaml: line 2:") { if !strings.Contains(err.Error(), "yaml: line 2:") {
t.Fatalf("expected %q to have 'yaml: line 2:' found a tab character", err.Error()) t.Fatalf("expected %q to have 'yaml: line 2:' found a tab character", err.Error())
} }
} }

2
staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
View File

@ -57,7 +57,7 @@ import (
// without applying any validations and/or defaults. It shouldn't be considered a replacement // without applying any validations and/or defaults. It shouldn't be considered a replacement
// for a real clientset and is mostly useful in simple unit tests. // for a real clientset and is mostly useful in simple unit tests.
func NewSimpleClientset(objects ...runtime.Object) *Clientset { func NewSimpleClientset(objects ...runtime.Object) *Clientset {
o := testing.NewObjectTracker(api.Scheme, api.Codecs.UniversalDecoder()) o := testing.NewObjectTracker(api.Registry, api.Scheme, api.Codecs.UniversalDecoder())
for _, obj := range objects { for _, obj := range objects {
if err := o.Add(obj); err != nil { if err := o.Add(obj); err != nil {
panic(err) panic(err)