mirror of
https://github.com/kubernetes/client-go.git
synced 2025-08-08 10:47:26 +00:00
Merge pull request #71225 from jta/master
Fix duped watch in client-go/testing. Kubernetes-commit: cab34050e7710993a2d30559599456dfa3ac489d
This commit is contained in:
Kubernetes Publisher
commit
6924ba6dfc
102
Godeps/Godeps.json
generated
102
Godeps/Godeps.json
generated
@ -404,207 +404,207 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
||||
"Rev": "f1a02064268befe9cb07b02128ff1b6c24041bec"
|
||||
"Rev": "57dc7e687b5426ecb5df4cabdcdce30fddb74f22"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/klog",
|
||||
|
||||
@ -339,10 +339,12 @@ func (t *tracker) getWatches(gvr schema.GroupVersionResource, ns string) []*watc
|
||||
if w := t.watchers[gvr][ns]; w != nil {
|
||||
watches = append(watches, w...)
|
||||
}
|
||||
if w := t.watchers[gvr][""]; w != nil {
|
||||
if ns != metav1.NamespaceAll {
|
||||
if w := t.watchers[gvr][metav1.NamespaceAll]; w != nil {
|
||||
watches = append(watches, w...)
|
||||
}
|
||||
}
|
||||
}
|
||||
return watches
|
||||
}
|
||||
|
||||
|
||||
@ -131,26 +131,47 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
op watch.EventType
|
||||
ns string
|
||||
}{
|
||||
{
|
||||
"foo",
|
||||
watch.Added,
|
||||
"test_namespace",
|
||||
},
|
||||
{
|
||||
"bar",
|
||||
watch.Added,
|
||||
"test_namespace",
|
||||
},
|
||||
{
|
||||
"baz",
|
||||
watch.Added,
|
||||
"",
|
||||
},
|
||||
{
|
||||
"bar",
|
||||
watch.Modified,
|
||||
"test_namespace",
|
||||
},
|
||||
{
|
||||
"baz",
|
||||
watch.Modified,
|
||||
"",
|
||||
},
|
||||
{
|
||||
"foo",
|
||||
watch.Deleted,
|
||||
"test_namespace",
|
||||
},
|
||||
{
|
||||
"bar",
|
||||
watch.Deleted,
|
||||
"test_namespace",
|
||||
},
|
||||
{
|
||||
"baz",
|
||||
watch.Deleted,
|
||||
"",
|
||||
},
|
||||
}
|
||||
|
||||
@ -169,6 +190,7 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
|
||||
wg.Add(len(watchNamespaces))
|
||||
for idx, watchNamespace := range watchNamespaces {
|
||||
i := idx
|
||||
watchNamespace := watchNamespace
|
||||
w, err := o.Watch(testResource, watchNamespace)
|
||||
if err != nil {
|
||||
t.Fatalf("test resource watch failed in %s: %v", watchNamespace, err)
|
||||
@ -176,6 +198,7 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
|
||||
go func() {
|
||||
assert.NoError(t, err, "watch invocation failed")
|
||||
for _, c := range cases {
|
||||
if watchNamespace == "" || c.ns == watchNamespace {
|
||||
fmt.Printf("%#v %#v\n", c, i)
|
||||
event := <-w.ResultChan()
|
||||
accessor, err := meta.Accessor(event.Object)
|
||||
@ -184,6 +207,8 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
|
||||
}
|
||||
assert.Equal(t, c.op, event.Type, "watch event mismatched")
|
||||
assert.Equal(t, c.name, accessor.GetName(), "watched object mismatch")
|
||||
assert.Equal(t, c.ns, accessor.GetNamespace(), "watched object mismatch")
|
||||
}
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
@ -191,13 +216,13 @@ func TestWatchCallMultipleInvocation(t *testing.T) {
|
||||
for _, c := range cases {
|
||||
switch c.op {
|
||||
case watch.Added:
|
||||
obj := getArbitraryResource(testResource, c.name, "test_namespace")
|
||||
o.Create(testResource, obj, "test_namespace")
|
||||
obj := getArbitraryResource(testResource, c.name, c.ns)
|
||||
o.Create(testResource, obj, c.ns)
|
||||
case watch.Modified:
|
||||
obj := getArbitraryResource(testResource, c.name, "test_namespace")
|
||||
o.Update(testResource, obj, "test_namespace")
|
||||
obj := getArbitraryResource(testResource, c.name, c.ns)
|
||||
o.Update(testResource, obj, c.ns)
|
||||
case watch.Deleted:
|
||||
o.Delete(testResource, "test_namespace", c.name)
|
||||
o.Delete(testResource, c.ns, c.name)
|
||||
}
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user