GODRIVER-3173 Update test runner to use response over read

Author: prestonvasquez

internal/integration/unified/event.go

@@ -16,30 +16,30 @@ import (
 type monitoringEventType string
 
 const (
-	commandStartedEvent             monitoringEventType = "CommandStartedEvent"
-	commandSucceededEvent           monitoringEventType = "CommandSucceededEvent"
-	commandFailedEvent              monitoringEventType = "CommandFailedEvent"
-	poolCreatedEvent                monitoringEventType = "PoolCreatedEvent"
-	poolReadyEvent                  monitoringEventType = "PoolReadyEvent"
-	poolClearedEvent                monitoringEventType = "PoolClearedEvent"
-	poolClosedEvent                 monitoringEventType = "PoolClosedEvent"
-	connectionCreatedEvent          monitoringEventType = "ConnectionCreatedEvent"
-	connectionReadyEvent            monitoringEventType = "ConnectionReadyEvent"
-	connectionClosedEvent           monitoringEventType = "ConnectionClosedEvent"
-	connectionCheckOutStartedEvent  monitoringEventType = "ConnectionCheckOutStartedEvent"
-	connectionCheckOutFailedEvent   monitoringEventType = "ConnectionCheckOutFailedEvent"
-	connectionCheckedOutEvent       monitoringEventType = "ConnectionCheckedOutEvent"
-	connectionCheckedInEvent        monitoringEventType = "ConnectionCheckedInEvent"
-	connectionPendingReadStarted    monitoringEventType = "ConnectionPendingReadStarted"
-	connectionPendingReadSucceeded  monitoringEventType = "ConnectionPendingReadSucceeded"
-	connectionPendingReadFailed     monitoringEventType = "ConnectionPendingReadFailed"
-	serverDescriptionChangedEvent   monitoringEventType = "ServerDescriptionChangedEvent"
-	serverHeartbeatFailedEvent      monitoringEventType = "ServerHeartbeatFailedEvent"
-	serverHeartbeatStartedEvent     monitoringEventType = "ServerHeartbeatStartedEvent"
-	serverHeartbeatSucceededEvent   monitoringEventType = "ServerHeartbeatSucceededEvent"
-	topologyDescriptionChangedEvent monitoringEventType = "TopologyDescriptionChangedEvent"
-	topologyOpeningEvent            monitoringEventType = "TopologyOpeningEvent"
-	topologyClosedEvent             monitoringEventType = "TopologyClosedEvent"
+	commandStartedEvent                monitoringEventType = "CommandStartedEvent"
+	commandSucceededEvent              monitoringEventType = "CommandSucceededEvent"
+	commandFailedEvent                 monitoringEventType = "CommandFailedEvent"
+	poolCreatedEvent                   monitoringEventType = "PoolCreatedEvent"
+	poolReadyEvent                     monitoringEventType = "PoolReadyEvent"
+	poolClearedEvent                   monitoringEventType = "PoolClearedEvent"
+	poolClosedEvent                    monitoringEventType = "PoolClosedEvent"
+	connectionCreatedEvent             monitoringEventType = "ConnectionCreatedEvent"
+	connectionReadyEvent               monitoringEventType = "ConnectionReadyEvent"
+	connectionClosedEvent              monitoringEventType = "ConnectionClosedEvent"
+	connectionCheckOutStartedEvent     monitoringEventType = "ConnectionCheckOutStartedEvent"
+	connectionCheckOutFailedEvent      monitoringEventType = "ConnectionCheckOutFailedEvent"
+	connectionCheckedOutEvent          monitoringEventType = "ConnectionCheckedOutEvent"
+	connectionCheckedInEvent           monitoringEventType = "ConnectionCheckedInEvent"
+	connectionPendingResponseStarted   monitoringEventType = "ConnectionPendingResponseStarted"
+	connectionPendingResponseSucceeded monitoringEventType = "ConnectionPendingResponseSucceeded"
+	connectionPendingResponseFailed    monitoringEventType = "ConnectionPendingResponseFailed"
+	serverDescriptionChangedEvent      monitoringEventType = "ServerDescriptionChangedEvent"
+	serverHeartbeatFailedEvent         monitoringEventType = "ServerHeartbeatFailedEvent"
+	serverHeartbeatStartedEvent        monitoringEventType = "ServerHeartbeatStartedEvent"
+	serverHeartbeatSucceededEvent      monitoringEventType = "ServerHeartbeatSucceededEvent"
+	topologyDescriptionChangedEvent    monitoringEventType = "TopologyDescriptionChangedEvent"
+	topologyOpeningEvent               monitoringEventType = "TopologyOpeningEvent"
+	topologyClosedEvent                monitoringEventType = "TopologyClosedEvent"
 )
 
 func monitoringEventTypeFromString(eventStr string) (monitoringEventType, bool) {
@@ -72,12 +72,12 @@ func monitoringEventTypeFromString(eventStr string) (monitoringEventType, bool)
 		return connectionCheckedOutEvent, true
 	case "connectioncheckedinevent":
 		return connectionCheckedInEvent, true
-	case "connectionpendingreadstarted":
-		return connectionPendingReadStarted, true
-	case "connectionpendingreadsucceeded":
-		return connectionPendingReadSucceeded, true
-	case "connectionpendingreadfailed":
-		return connectionPendingReadFailed, true
+	case "connectionpendingresponsestarted":
+		return connectionPendingResponseStarted, true
+	case "connectionpendingresponsesucceeded":
+		return connectionPendingResponseSucceeded, true
+	case "connectionpendingresponsefailed":
+		return connectionPendingResponseFailed, true
 	case "serverdescriptionchangedevent":
 		return serverDescriptionChangedEvent, true
 	case "serverheartbeatfailedevent":
@@ -122,11 +122,11 @@ func monitoringEventTypeFromPoolEvent(evt *event.PoolEvent) monitoringEventType
 	case event.ConnectionCheckedIn:
 		return connectionCheckedInEvent
 	case event.ConnectionPendingResponseStarted:
-		return connectionPendingReadStarted
+		return connectionPendingResponseStarted
 	case event.ConnectionPendingResponseSucceeded:
-		return connectionPendingReadSucceeded
+		return connectionPendingResponseSucceeded
 	case event.ConnectionPendingResponseFailed:
-		return connectionPendingReadFailed
+		return connectionPendingResponseFailed
 	default:
 		return ""
 	}

internal/integration/unified/event_verification.go

@@ -56,10 +56,10 @@ type cmapEvent struct {
 		Reason *string `bson:"reason"`
 	} `bson:"connectionCheckOutFailedEvent"`
 
-	ConnectionCheckedInEvent       *struct{} `bson:"connectionCheckedInEvent"`
-	ConnectionPendingReadStarted   *struct{} `bson:"connectionPendingReadStarted"`
-	ConnectionPendingreadSucceeded *struct{} `bson:"connectionPendingReadSucceeded"`
-	ConnectionPendingReadFailed    *struct{} `bson:"connectionPendingReadFailed"`
+	ConnectionCheckedInEvent           *struct{} `bson:"connectionCheckedInEvent"`
+	ConnectionPendingResponseStarted   *struct{} `bson:"connectionPendingResponseStarted"`
+	ConnectionPendingResponseSucceeded *struct{} `bson:"connectionPendingResponseSucceeded"`
+	ConnectionPendingResponseFailed    *struct{} `bson:"connectionPendingResponseFailed"`
 
 	PoolClearedEvent *struct {
 		HasServiceID              *bool `bson:"hasServiceId"`
@@ -362,15 +362,15 @@ func verifyCMAPEvents(client *clientEntity, expectedEvents *expectedEvents) erro
 			if _, pooled, err = getNextPoolEvent(pooled, event.ConnectionCheckedIn); err != nil {
 				return newEventVerificationError(idx, client, "failed to get next pool event: %v", err.Error())
 			}
-		case evt.ConnectionPendingReadStarted != nil:
+		case evt.ConnectionPendingResponseStarted != nil:
 			if _, pooled, err = getNextPoolEvent(pooled, event.ConnectionPendingResponseStarted); err != nil {
 				return newEventVerificationError(idx, client, "failed to get next pool event: %v", err.Error())
 			}
-		case evt.ConnectionPendingreadSucceeded != nil:
+		case evt.ConnectionPendingResponseSucceeded != nil:
 			if _, pooled, err = getNextPoolEvent(pooled, event.ConnectionPendingResponseSucceeded); err != nil {
 				return newEventVerificationError(idx, client, "failed to get next pool event: %v", err.Error())
 			}
-		case evt.ConnectionPendingReadFailed != nil:
+		case evt.ConnectionPendingResponseFailed != nil:
 			if _, pooled, err = getNextPoolEvent(pooled, event.ConnectionPendingResponseFailed); err != nil {
 				return newEventVerificationError(idx, client, "failed to get next pool event: %v", err.Error())
 			}