From a011a6d41e1d2c863988829bf481e6c3e565c4ad Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Wed, 23 Aug 2017 19:19:42 -0700 Subject: [PATCH 1/2] Fix swallowed error in registrytest --- pkg/registry/registrytest/etcd.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 13abeac2baa..378ac2328c9 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -222,6 +222,9 @@ func (t *Tester) emitObject(obj runtime.Object, action string) error { return err } _, _, err = t.storage.Delete(ctx, accessor.GetName(), nil) + if err != nil { + return err + } default: err = fmt.Errorf("unexpected action: %v", action) } From d73b3d049d66475968ecf10fa2769b747e38a207 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Fri, 25 Aug 2017 12:59:57 -0700 Subject: [PATCH 2/2] Unshadow error in registrytest --- pkg/registry/registrytest/etcd.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 378ac2328c9..4eb4650de4c 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -217,14 +217,12 @@ func (t *Tester) emitObject(obj runtime.Object, action string) error { case etcdstorage.EtcdCreate: err = t.createObject(ctx, obj) case etcdstorage.EtcdDelete: - accessor, err := meta.Accessor(obj) + var accessor metav1.Object + accessor, err = meta.Accessor(obj) if err != nil { return err } _, _, err = t.storage.Delete(ctx, accessor.GetName(), nil) - if err != nil { - return err - } default: err = fmt.Errorf("unexpected action: %v", action) }