Add cleanup function; Fix build

This commit is contained in:
Caleb Woodbine 2020-06-04 10:47:10 +12:00
parent 34988cfe0e
commit 34ddb64825
2 changed files with 5 additions and 5 deletions

View File

@ -58,6 +58,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
@ -66,6 +67,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/tools/watch:go_default_library",

View File

@ -36,11 +36,6 @@ import (
"github.com/onsi/ginkgo"
)
var (
// tests which use this appear to all pass within the given time
generalWatchTimeout = int64(60)
)
var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
f := framework.NewDefaultFramework("configmap")
@ -288,6 +283,9 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
framework.ExpectEqual(eventFound, true, "failed to find ConfigMap %v event", watch.Deleted)
return actualWatchEvents
}, func() (err error) {
_ = f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{LabelSelector: "test-configmap-static=true"})
return err
})
})
})