github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13584 from wojtek-t/remaining_test_refactorings

Browse Source 
Refactor registry tests to reduce dependency on go-etcd.
This commit is contained in:
Quinton Hoole
2015-09-04 13:12:45 -07:00
parent fc946ce4a4 2b2d6b677d
commit 49702f9059
9 changed files with 188 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/rest/resttest/resttest.go
View File

@@ -23,7 +23,6 @@ import (
"testing"
"time"
"github.com/coreos/go-etcd/etcd"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/rest"
@@ -544,7 +543,7 @@ func (t *Tester) testDeleteNoGraceful(obj runtime.Object, setFn SetFunc, getFn G
func (t *Tester) testDeleteNonExist(obj runtime.Object) {
objectMeta := t.getObjectMetaOrFail(obj)
t.withStorageError(&etcd.EtcdError{ErrorCode: tools.EtcdErrorCodeNotFound}, func() {
t.withStorageError(tools.EtcdErrorNotFound, func() {
_, err := t.storage.(rest.GracefulDeleter).Delete(t.TestContext(), objectMeta.Name, nil)
if err == nil || !errors.IsNotFound(err) {
t.Errorf("unexpected error: %v", err)