Address issues with test failures

Author: heyste

test/conformance/testdata/conformance.yaml

@@ -811,7 +811,7 @@
     new message, the check MUST have the update message. The event is deleted and
     MUST NOT show up when listing all events.
   release: v1.19
-  file: test/e2e/framework/events/events.go
+  file: test/e2e/apimachinery/events.go
 - testname: Garbage Collector, delete deployment,  propagation policy background
   codename: '[sig-api-machinery] Garbage collector should delete RS created by deployment
     when not orphaning [Conformance]'

test/e2e/apimachinery/BUILD

@@ -17,6 +17,7 @@ go_library(
         "custom_resource_definition.go",
         "discovery.go",
         "etcd_failure.go",
+        "events.go",
         "framework.go",
         "garbage_collector.go",
         "generated_clientset.go",

test/e2e/framework/events/BUILD

@@ -6,13 +6,9 @@ go_library(
     importpath = "k8s.io/kubernetes/test/e2e/framework/events",
     visibility = ["//visibility:public"],
     deps = [
-        "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
-        "//test/e2e/framework:go_default_library",
-        "//vendor/github.com/onsi/ginkgo:go_default_library",
     ],
 )
 

test/e2e/framework/events/events.go

@@ -30,7 +30,6 @@ import (
 // Action is a function to be performed by the system.
 type Action func() error
 
-
 // WaitTimeoutForEvent waits the given timeout duration for an event to occur.
 func WaitTimeoutForEvent(c clientset.Interface, namespace, eventSelector, msg string, timeout time.Duration) error {
 	interval := 2 * time.Second