github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61154 from hanxiaoshuai/bugfix0314

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

catch err when Watch testResource failed in func TestWatchCallNonNamespace

**What this PR does / why we need it**:
catch err when Watch testResource failed in func TestWatchCallNonNamespace
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #
[#61155](https://github.com/kubernetes/kubernetes/issues/61155)
**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-07 05:08:06 -07:00 committed by GitHub
commit 89542d9ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/client-go/testing/fixture_test.go
View File

@ -63,6 +63,9 @@ func TestWatchCallNonNamespace(t *testing.T) {
codecs := serializer.NewCodecFactory(scheme)
o := NewObjectTracker(scheme, codecs.UniversalDecoder())
watch, err := o.Watch(testResource, ns)
if err != nil {
t.Fatalf("test resource watch failed in %s: %v ", ns, err)
}
go func() {
err := o.Create(testResource, testObj, ns)
if err != nil {
@ -85,7 +88,13 @@ func TestWatchCallAllNamespace(t *testing.T) {
codecs := serializer.NewCodecFactory(scheme)
o := NewObjectTracker(scheme, codecs.UniversalDecoder())
w, err := o.Watch(testResource, "test_namespace")
if err != nil {
t.Fatalf("test resource watch failed in test_namespace: %v", err)
}
wAll, err := o.Watch(testResource, "")
if err != nil {
t.Fatalf("test resource watch failed in all namespaces: %v", err)
}
go func() {
err := o.Create(testResource, testObj, ns)
assert.NoError(t, err, "test resource creation failed")
@ -161,6 +170,9 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
for idx, watchNamespace := range watchNamespaces {
i := idx
w, err := o.Watch(testResource, watchNamespace)
if err != nil {
t.Fatalf("test resource watch failed in %s: %v", watchNamespace, err)
}
go func() {
assert.NoError(t, err, "watch invocation failed")
for _, c := range cases {