updates

Author: qingyang-hu

mongo/integration/cmd_monitoring_helpers_test.go

@@ -321,19 +321,21 @@ func compareStartedEvents(mt *mtest.T, expectations []*cmdStartedEvt, id0, id1 b
 		}
 
 		var evt *event.CommandStartedEvent
-		// skip events not in expectations
-		for {
-			evt = mt.GetStartedEvent()
-			if evt == nil {
-				return errors.New("expected CommandStartedEvent, got nil")
-			}
-			if v, ok := expectedCmds[evt.CommandName]; ok && v {
-				break
+		if expected.CommandName != "" {
+			// skip events not in expectations
+			for {
+				evt = mt.GetStartedEvent()
+				if evt == nil {
+					return fmt.Errorf("expected CommandStartedEvent %s, got nil", expected.CommandName)
+				}
+				if v, ok := expectedCmds[evt.CommandName]; ok && v {
+					break
+				}
 			}
-		}
 
-		if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-			return fmt.Errorf("command name mismatch for started event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			if expected.CommandName != evt.CommandName {
+				return fmt.Errorf("command name mismatch for started event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			}
 		}
 		if expected.DatabaseName != "" && expected.DatabaseName != evt.DatabaseName {
 			return fmt.Errorf("database name mismatch; expected %s, got %s", expected.DatabaseName, evt.DatabaseName)
@@ -458,19 +460,21 @@ func compareSucceededEvents(mt *mtest.T, expectations []*cmdSucceededEvt) error
 		}
 
 		var evt *event.CommandSucceededEvent
-		// skip events not in expectations
-		for {
-			evt = mt.GetSucceededEvent()
-			if evt == nil {
-				return errors.New("expected CommandSucceededEvent, got nil")
-			}
-			if v, ok := expectedCmds[evt.CommandName]; ok && v {
-				break
+		if expected.CommandName != "" {
+			// skip events not in expectations
+			for expected.CommandName != "" {
+				evt = mt.GetSucceededEvent()
+				if evt == nil {
+					return fmt.Errorf("expected CommandSucceededEvent %s, got nil", expected.CommandName)
+				}
+				if v, ok := expectedCmds[evt.CommandName]; ok && v {
+					break
+				}
 			}
-		}
 
-		if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-			return fmt.Errorf("command name mismatch for succeeded event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			if expected.CommandName != evt.CommandName {
+				return fmt.Errorf("command name mismatch for succeeded event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			}
 		}
 
 		eElems, err := expected.Reply.Elements()
@@ -519,19 +523,21 @@ func compareFailedEvents(mt *mtest.T, expectations []*cmdFailedEvt) error {
 		}
 
 		var evt *event.CommandFailedEvent
-		// skip events not in expectations
-		for {
-			evt = mt.GetFailedEvent()
-			if evt == nil {
-				return errors.New("expected CommandFailedEvent, got nil")
-			}
-			if v, ok := expectedCmds[evt.CommandName]; ok && v {
-				break
+		if expected.CommandName != "" {
+			// skip events not in expectations
+			for expected.CommandName != "" {
+				evt = mt.GetFailedEvent()
+				if evt == nil {
+					return fmt.Errorf("expected CommandFailedEvent %s, got nil", expected.CommandName)
+				}
+				if v, ok := expectedCmds[evt.CommandName]; ok && v {
+					break
+				}
 			}
-		}
 
-		if expected.CommandName != "" && expected.CommandName != evt.CommandName {
-			return fmt.Errorf("command name mismatch for failed event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			if expected.CommandName != evt.CommandName {
+				return fmt.Errorf("command name mismatch for failed event; expected %s, got %s", expected.CommandName, evt.CommandName)
+			}
 		}
 		return nil
 	}