diff --git a/test/conformance/helpers/broker_data_plane_test_helper.go b/test/conformance/helpers/broker_data_plane_test_helper.go index 1e34098dd67..ad5dfd4728c 100644 --- a/test/conformance/helpers/broker_data_plane_test_helper.go +++ b/test/conformance/helpers/broker_data_plane_test_helper.go @@ -21,6 +21,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1" testlib "knative.dev/eventing/test/lib" "knative.dev/eventing/test/lib/recordevents" @@ -66,7 +67,6 @@ func BrokerV1Beta1IngressDataPlaneTestHelper( triggerName := "trigger" loggerName := "logger-pod" eventTracker, _ := recordevents.StartEventRecordOrFail(client, loggerName) - defer eventTracker.Cleanup() client.WaitForAllTestResourcesReadyOrFail() trigger := client.CreateTriggerOrFailV1Beta1( @@ -211,9 +211,7 @@ func BrokerV1Beta1ConsumerDataPlaneTestHelper( loggerName := "logger-pod" secondLoggerName := "second-logger-pod" eventTracker, _ := recordevents.StartEventRecordOrFail(client, loggerName) - defer eventTracker.Cleanup() secondTracker, _ := recordevents.StartEventRecordOrFail(client, secondLoggerName) - defer secondTracker.Cleanup() client.WaitForAllTestResourcesReadyOrFail() trigger := client.CreateTriggerOrFailV1Beta1( @@ -332,8 +330,6 @@ func BrokerV1Beta1ConsumerDataPlaneTestHelper( resources.WithSubscriberServiceRefForTriggerV1Beta1("transformer-pod"), ) client.WaitForResourceReadyOrFail(transformTrigger.Name, testlib.TriggerTypeMeta) - transformEventTracker, _ := recordevents.StartEventRecordOrFail(client, "transform-events-logger") - defer transformEventTracker.Cleanup() replyTrigger := client.CreateTriggerOrFailV1Beta1( "reply-trigger", diff --git a/test/conformance/helpers/channel_header_single_event_helper.go b/test/conformance/helpers/channel_header_single_event_helper.go index d831df4d66b..615414d16a1 100644 --- a/test/conformance/helpers/channel_header_single_event_helper.go +++ b/test/conformance/helpers/channel_header_single_event_helper.go @@ -61,8 +61,6 @@ func SingleEventWithKnativeHeaderHelperForChannelTestHelper( // create logger service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - // create subscription to subscribe the channel, and forward the received events to the logger service client.CreateSubscriptionOrFail( subscriptionName, diff --git a/test/conformance/helpers/tracing_test_helper.go b/test/conformance/helpers/tracing_test_helper.go index a22b3aef92f..9f4d5772f0d 100644 --- a/test/conformance/helpers/tracing_test_helper.go +++ b/test/conformance/helpers/tracing_test_helper.go @@ -69,7 +69,6 @@ func tracingTest( if err != nil { t.Fatalf("Pod tracker failed: %v", err) } - defer targetTracker.Cleanup() matches := targetTracker.AssertAtLeast(1, recordevents.MatchEvent(eventMatcher)) // Match the trace diff --git a/test/e2e/helpers/broker_channel_flow_helper.go b/test/e2e/helpers/broker_channel_flow_helper.go index e562b1d3924..ce216c5ce79 100644 --- a/test/e2e/helpers/broker_channel_flow_helper.go +++ b/test/e2e/helpers/broker_channel_flow_helper.go @@ -130,7 +130,6 @@ func BrokerChannelFlowWithTransformation(t *testing.T, } // create event tracker that should receive all sent events allEventTracker, _ := recordevents.StartEventRecordOrFail(client, allEventsRecorderPodName) - defer allEventTracker.Cleanup() // create trigger to receive all the events if triggerVersion == "v1" { @@ -175,7 +174,6 @@ func BrokerChannelFlowWithTransformation(t *testing.T, // create event tracker that should receive only transformed events transformedEventTracker, _ := recordevents.StartEventRecordOrFail(client, transformedEventsRecorderPodName) - defer transformedEventTracker.Cleanup() // create subscription client.CreateSubscriptionOrFail( diff --git a/test/e2e/helpers/broker_event_transformation_test_helper.go b/test/e2e/helpers/broker_event_transformation_test_helper.go index 3c8490fdd01..dae341369b8 100644 --- a/test/e2e/helpers/broker_event_transformation_test_helper.go +++ b/test/e2e/helpers/broker_event_transformation_test_helper.go @@ -97,8 +97,6 @@ func EventTransformationForTriggerTestHelper(t *testing.T, // create logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - // create trigger2 for event receiving if triggerVersion == "v1" { client.CreateTriggerV1OrFail( diff --git a/test/e2e/helpers/broker_redelivery_helper.go b/test/e2e/helpers/broker_redelivery_helper.go index 32488302061..5437a9639c1 100644 --- a/test/e2e/helpers/broker_redelivery_helper.go +++ b/test/e2e/helpers/broker_redelivery_helper.go @@ -90,7 +90,6 @@ func brokerRedelivery(t *testing.T, creator BrokerCreatorWithRetries, numRetries eventRecord, options..., ) - defer allEventTracker.Cleanup() // Create a Broker. brokerName := creator(client, numRetries) diff --git a/test/e2e/helpers/broker_test_helper.go b/test/e2e/helpers/broker_test_helper.go index 59378965edc..f232378b5cc 100644 --- a/test/e2e/helpers/broker_test_helper.go +++ b/test/e2e/helpers/broker_test_helper.go @@ -259,8 +259,6 @@ func TestBrokerWithManyTriggers(t *testing.T, brokerCreator BrokerCreator, shoul subscriberName := "dumper-" + event.String() eventTracker, _ := recordevents.StartEventRecordOrFail(client, subscriberName) eventTrackers[subscriberName] = eventTracker - defer eventTracker.Cleanup() - // Create trigger. triggerName := "trigger-" + event.String() client.CreateTriggerOrFailV1Beta1(triggerName, diff --git a/test/e2e/helpers/channel_chain_test_helper.go b/test/e2e/helpers/channel_chain_test_helper.go index 05b0bbde7a2..2328f7f38f4 100644 --- a/test/e2e/helpers/channel_chain_test_helper.go +++ b/test/e2e/helpers/channel_chain_test_helper.go @@ -56,8 +56,6 @@ func ChannelChainTestHelper(t *testing.T, // create loggerPod and expose it as a service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - // create subscription to subscribe the channel, and forward the received events to the logger service switch subscriptionVersion { case SubscriptionV1: diff --git a/test/e2e/helpers/channel_defaulter_test_helper.go b/test/e2e/helpers/channel_defaulter_test_helper.go index 9b6cd83c829..78be8c93209 100644 --- a/test/e2e/helpers/channel_defaulter_test_helper.go +++ b/test/e2e/helpers/channel_defaulter_test_helper.go @@ -28,6 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + reconciler "knative.dev/pkg/reconciler" + eventingduck "knative.dev/eventing/pkg/apis/duck/v1alpha1" "knative.dev/eventing/pkg/apis/messaging/config" eventingtesting "knative.dev/eventing/pkg/reconciler/testing/v1beta1" @@ -35,7 +37,6 @@ import ( "knative.dev/eventing/test/lib/duck" "knative.dev/eventing/test/lib/recordevents" "knative.dev/eventing/test/lib/resources" - reconciler "knative.dev/pkg/reconciler" ) const ( @@ -98,8 +99,6 @@ func defaultChannelTestHelper(t *testing.T, client *testlib.Client, expectedChan // create event logger pod and service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - // create subscription to subscribe the channel, and forward the received events to the logger service client.CreateSubscriptionOrFail( subscriptionName, diff --git a/test/e2e/helpers/channel_dls_test_helper.go b/test/e2e/helpers/channel_dls_test_helper.go index 2cceeb660af..a9b677b4f42 100644 --- a/test/e2e/helpers/channel_dls_test_helper.go +++ b/test/e2e/helpers/channel_dls_test_helper.go @@ -53,8 +53,6 @@ func ChannelDeadLetterSinkTestHelper(t *testing.T, // create event logger pod and service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - // create subscriptions that subscribe to a service that does not exist switch subscriptionVersion { case SubscriptionV1: diff --git a/test/e2e/helpers/channel_event_tranformation_test_helper.go b/test/e2e/helpers/channel_event_tranformation_test_helper.go index 188f653b3bd..9b252ff4f3c 100644 --- a/test/e2e/helpers/channel_event_tranformation_test_helper.go +++ b/test/e2e/helpers/channel_event_tranformation_test_helper.go @@ -72,8 +72,6 @@ func EventTransformationForSubscriptionTestHelper(t *testing.T, // create event logger pod and service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() - switch subscriptionVersion { case SubscriptionV1: // create subscriptions that subscribe the first channel, use the transformation service to transform the events and then forward the transformed events to the second channel diff --git a/test/e2e/helpers/channel_single_event_helper.go b/test/e2e/helpers/channel_single_event_helper.go index 9225bab626d..2e0131eca09 100644 --- a/test/e2e/helpers/channel_single_event_helper.go +++ b/test/e2e/helpers/channel_single_event_helper.go @@ -65,8 +65,6 @@ func SingleEventForChannelTestHelper(t *testing.T, encoding cloudevents.Encoding // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, eventRecorder) - defer eventTracker.Cleanup() - // If the caller specified a different version, override it here. if channelVersion != "" { st.Logf("Changing API version from: %q to %q", channel.APIVersion, channelVersion) diff --git a/test/e2e/helpers/parallel_test_helper.go b/test/e2e/helpers/parallel_test_helper.go index d6998747160..daf2edfda68 100644 --- a/test/e2e/helpers/parallel_test_helper.go +++ b/test/e2e/helpers/parallel_test_helper.go @@ -144,8 +144,6 @@ func ParallelTestHelper(t *testing.T, HasSource(eventSource), DataContains(tc.expected), )) - - eventTracker.Cleanup() } }) } @@ -252,8 +250,6 @@ func ParallelV1TestHelper(t *testing.T, HasSource(eventSource), DataContains(tc.expected), )) - - eventTracker.Cleanup() } }) } diff --git a/test/e2e/helpers/sequence_test_helper.go b/test/e2e/helpers/sequence_test_helper.go index 5991dadf625..321957d96bb 100644 --- a/test/e2e/helpers/sequence_test_helper.go +++ b/test/e2e/helpers/sequence_test_helper.go @@ -97,7 +97,6 @@ func SequenceTestHelper(t *testing.T, client.CreateChannelOrFail(channelName, &channel) // create event logger pod and service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() // create subscription to subscribe the channel, and forward the received events to the logger service client.CreateSubscriptionOrFail( subscriptionName, @@ -211,7 +210,6 @@ func SequenceV1TestHelper(t *testing.T, client.CreateChannelOrFail(channelName, &channel) // create event logger pod and service as the subscriber eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventsPodName) - defer eventTracker.Cleanup() // create subscription to subscribe the channel, and forward the received events to the logger service client.CreateSubscriptionOrFail( subscriptionName, diff --git a/test/e2e/helpers/trigger_no_broker_test_helper.go b/test/e2e/helpers/trigger_no_broker_test_helper.go index 3749d440b7e..0f7d04f2445 100644 --- a/test/e2e/helpers/trigger_no_broker_test_helper.go +++ b/test/e2e/helpers/trigger_no_broker_test_helper.go @@ -24,8 +24,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + testlib "knative.dev/eventing/test/lib" - "knative.dev/eventing/test/lib/recordevents" "knative.dev/eventing/test/lib/resources" ) @@ -40,9 +40,8 @@ func TestTriggerNoBroker(t *testing.T, channel string, brokerCreator BrokerCreat brokerName := strings.ToLower(channel) subscriberName := "dumper-empty" - eventTracker, _ := recordevents.StartEventRecordOrFail(client, subscriberName) - defer eventTracker.Cleanup() - + eventRecordPod := resources.EventRecordPod(subscriberName) + client.CreatePodOrFail(eventRecordPod, testlib.WithService(subscriberName)) client.CreateTriggerOrFailV1Beta1("testtrigger", resources.WithSubscriberServiceRefForTriggerV1Beta1(subscriberName), resources.WithBrokerV1Beta1(brokerName), diff --git a/test/e2e/source_api_server_v1alpha2_test.go b/test/e2e/source_api_server_v1alpha2_test.go index 561a459a6d3..932548873ef 100644 --- a/test/e2e/source_api_server_v1alpha2_test.go +++ b/test/e2e/source_api_server_v1alpha2_test.go @@ -147,8 +147,6 @@ func TestApiServerSourceV1Alpha2(t *testing.T) { // create event record recordEventPodName := fmt.Sprintf("%s-%s", baseLoggerPodName, tc.name) eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - spec := tc.spec spec.Sink = duckv1.Destination{Ref: resources.ServiceKRef(recordEventPodName)} diff --git a/test/e2e/source_api_server_v1beta1_test.go b/test/e2e/source_api_server_v1beta1_test.go index 80c00635127..69c3a34a037 100644 --- a/test/e2e/source_api_server_v1beta1_test.go +++ b/test/e2e/source_api_server_v1beta1_test.go @@ -147,8 +147,6 @@ func TestApiServerSourceV1Beta1(t *testing.T) { // create event record recordEventPodName := fmt.Sprintf("%s-%s", baseLoggerPodName, tc.name) eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - spec := tc.spec spec.Sink = duckv1.Destination{Ref: resources.ServiceKRef(recordEventPodName)} diff --git a/test/e2e/source_container_v1alpha2_test.go b/test/e2e/source_container_v1alpha2_test.go index 7f0b0f4ed86..83fe7cd6227 100644 --- a/test/e2e/source_container_v1alpha2_test.go +++ b/test/e2e/source_container_v1alpha2_test.go @@ -51,8 +51,6 @@ func TestContainerSourceV1Alpha2(t *testing.T) { // create event record pod eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create container source message := fmt.Sprintf("TestContainerSource%s", uuid.NewUUID()) // args are the arguments passing to the container, msg is used in the heartbeats image diff --git a/test/e2e/source_container_v1beta1_test.go b/test/e2e/source_container_v1beta1_test.go index a335073e5f7..8853f7ad922 100644 --- a/test/e2e/source_container_v1beta1_test.go +++ b/test/e2e/source_container_v1beta1_test.go @@ -52,8 +52,6 @@ func TestContainerSourceV1Beta1(t *testing.T) { // create event record pod eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create container source message := fmt.Sprintf("TestContainerSource%s", uuid.NewUUID()) // args are the arguments passing to the container, msg is used in the heartbeats image diff --git a/test/e2e/source_ping_test.go b/test/e2e/source_ping_test.go index d0d14970209..3e447d81138 100644 --- a/test/e2e/source_ping_test.go +++ b/test/e2e/source_ping_test.go @@ -31,9 +31,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" + duckv1 "knative.dev/pkg/apis/duck/v1" + testlib "knative.dev/eventing/test/lib" "knative.dev/eventing/test/lib/resources" - duckv1 "knative.dev/pkg/apis/duck/v1" eventingtesting "knative.dev/eventing/pkg/reconciler/testing" ) @@ -51,8 +52,6 @@ func TestPingSourceV1Alpha2(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create cron job source data := fmt.Sprintf(`{"msg":"TestPingSource %s"}`, uuid.NewUUID()) source := eventingtesting.NewPingSourceV1Alpha2( @@ -92,8 +91,6 @@ func TestPingSourceV1Alpha2ResourceScope(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create cron job source data := fmt.Sprintf(`{"msg":"TestPingSource %s"}`, uuid.NewUUID()) source := eventingtesting.NewPingSourceV1Alpha2( diff --git a/test/e2e/source_sinkbinding_v1alpha1_test.go b/test/e2e/source_sinkbinding_v1alpha1_test.go index df3ef331d82..77e2bdb7711 100644 --- a/test/e2e/source_sinkbinding_v1alpha1_test.go +++ b/test/e2e/source_sinkbinding_v1alpha1_test.go @@ -54,8 +54,6 @@ func TestSinkBindingDeployment(t *testing.T) { // create event record pod eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - extensionSecret := string(uuid.NewUUID()) // create sink binding @@ -137,8 +135,6 @@ func TestSinkBindingCronJob(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPod) - defer eventTracker.Cleanup() - // create sink binding sinkBinding := eventingtesting.NewSinkBindingV1Alpha1( sinkBindingName, diff --git a/test/e2e/source_sinkbinding_v1alpha2_test.go b/test/e2e/source_sinkbinding_v1alpha2_test.go index 2705bc185a0..8e8e0c037c9 100644 --- a/test/e2e/source_sinkbinding_v1alpha2_test.go +++ b/test/e2e/source_sinkbinding_v1alpha2_test.go @@ -54,8 +54,6 @@ func TestSinkBindingV1Alpha2Deployment(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - extensionSecret := string(uuid.NewUUID()) // create sink binding @@ -138,8 +136,6 @@ func TestSinkBindingV1Alpha2CronJob(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create sink binding sinkBinding := eventingtesting.NewSinkBindingV1Alpha2( sinkBindingName, diff --git a/test/e2e/source_sinkbinding_v1beta1_test.go b/test/e2e/source_sinkbinding_v1beta1_test.go index ad2d8d4fb4d..0df34b42eb2 100644 --- a/test/e2e/source_sinkbinding_v1beta1_test.go +++ b/test/e2e/source_sinkbinding_v1beta1_test.go @@ -54,8 +54,6 @@ func TestSinkBindingV1Beta1Deployment(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - extensionSecret := string(uuid.NewUUID()) // create sink binding @@ -138,8 +136,6 @@ func TestSinkBindingV1Beta1CronJob(t *testing.T) { // create event logger pod and service eventTracker, _ := recordevents.StartEventRecordOrFail(client, recordEventPodName) - defer eventTracker.Cleanup() - // create sink binding sinkBinding := eventingtesting.NewSinkBindingV1Beta1( sinkBindingName, diff --git a/test/e2e/trigger_dependency_annotation_test.go b/test/e2e/trigger_dependency_annotation_test.go index 0171c80079d..efc65faa1f2 100644 --- a/test/e2e/trigger_dependency_annotation_test.go +++ b/test/e2e/trigger_dependency_annotation_test.go @@ -27,6 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/pkg/apis" + "knative.dev/eventing/pkg/apis/eventing" sourcesv1alpha2 "knative.dev/eventing/pkg/apis/sources/v1alpha2" sugarresources "knative.dev/eventing/pkg/reconciler/sugar/resources" @@ -34,7 +36,6 @@ import ( testlib "knative.dev/eventing/test/lib" "knative.dev/eventing/test/lib/recordevents" "knative.dev/eventing/test/lib/resources" - "knative.dev/pkg/apis" ) // This test is for avoiding regressions on the trigger dependency annotation functionality. @@ -63,8 +64,6 @@ func TestTriggerDependencyAnnotation(t *testing.T) { // Create subscribers. eventTracker, _ := recordevents.StartEventRecordOrFail(client, subscriberName) - defer eventTracker.Cleanup() - // Wait for subscriber to become ready client.WaitForAllTestResourcesReadyOrFail() diff --git a/test/lib/recordevents/event_info_store.go b/test/lib/recordevents/event_info_store.go index 90af0ceaf3e..e8bde788934 100644 --- a/test/lib/recordevents/event_info_store.go +++ b/test/lib/recordevents/event_info_store.go @@ -93,6 +93,7 @@ func NewEventInfoStore(client *testlib.Client, podName string) (*EventInfoStore, ei := newTestableEventInfoStore(egi, -1, -1) ei.podName = podName ei.tb = client.T + client.T.Cleanup(ei.cleanup) return ei, nil } @@ -173,10 +174,14 @@ func (ei *EventInfoStore) doRetrieveData() error { // Clean up any background resources used by the store. Must be called exactly once after // the last use. -func (ei *EventInfoStore) Cleanup() { +func (ei *EventInfoStore) cleanup() { close(ei.closeCh) } +//TODO remove it, this is not useful anymore +// Deprecated: you can remove the manual cleanup of the event getter, since now it's done at test tear down automatically +func (ei *EventInfoStore) Cleanup() {} + // Called internally by functions wanting the current list of all // known events. This calls for an update from the REST server and // returns the summary of all locally and remotely known events. diff --git a/test/lib/recordevents/event_info_store_test.go b/test/lib/recordevents/event_info_store_test.go index 47fcd3ece6a..52f09c76fb8 100644 --- a/test/lib/recordevents/event_info_store_test.go +++ b/test/lib/recordevents/event_info_store_test.go @@ -157,7 +157,7 @@ func TestSequentialAndTrim(t *testing.T) { t.Fatalf("Unexpected error from find: %v", err) } checkEvIDEqual(t, allData, expectedFull[:19]) - ei.Cleanup() + ei.cleanup() } // Test that Finds where the server gives overlapping updates @@ -181,7 +181,7 @@ func TestOverlap(t *testing.T) { t.Fatalf("Unexpected error from find: %v", err) } checkEvIDEqual(t, allData, expectedFull[:19]) - ei.Cleanup() + ei.cleanup() } // Test that we see an error if repeated Finds see a gap in the sequence @@ -204,7 +204,7 @@ func TestGap(t *testing.T) { if err == nil { t.Fatalf("Unexpected success from find") } - ei.Cleanup() + ei.cleanup() } // Test that two finds, with the second one having @@ -228,7 +228,7 @@ func TestSequentialNoOp(t *testing.T) { t.Fatalf("Unexpected error from find: %v", err) } checkEvIDEqual(t, allData, expectedFull[:10]) - ei.Cleanup() + ei.cleanup() } // Test that wait for N Works @@ -275,5 +275,5 @@ func TestWaitForN(t *testing.T) { if tCalls < 2 { t.Fatalf("Expected at least %d trim calls, saw %d", 2, tCalls) } - ei.Cleanup() + ei.cleanup() }