All MongoExecutionTimeoutException as a timeout error until JAVA-5248 is done

Author: rozza

driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java

@@ -246,7 +246,7 @@ public static MongoException createSpecialException(@Nullable final BsonDocument
         int errorCode = getErrorCode(response);
         String errorMessage = getErrorMessage(response, errorMessageFieldName);
         if (ErrorCategory.fromErrorCode(errorCode) == ErrorCategory.EXECUTION_TIMEOUT) {
-            //TODO JAVA-5248 when timeoutMS is set, MongoOperationTimeoutException should be thrown.
+            // TODO (CSOT) JAVA-5248 when timeoutMS is set, MongoOperationTimeoutException should be thrown.
             return new MongoExecutionTimeoutException(errorCode, errorMessage, response);
         } else if (isNodeIsRecoveringError(errorCode, errorMessage)) {
             return new MongoNodeIsRecoveringException(response, serverAddress);

driver-sync/src/test/functional/com/mongodb/client/unified/ErrorMatcher.java

@@ -20,6 +20,7 @@
 import com.mongodb.MongoClientException;
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoException;
+import com.mongodb.MongoExecutionTimeoutException;
 import com.mongodb.MongoOperationTimeoutException;
 import com.mongodb.MongoServerException;
 import com.mongodb.MongoSocketException;
@@ -66,9 +67,10 @@ void assertErrorsMatch(final BsonDocument expectedError, final Exception e) {
         }
 
         if (expectedError.containsKey("isTimeoutError")) {
+            // TODO (CSOT) JAVA-5248 Should only be MongoOperationTimeoutException.
             assertEquals(context.getMessage("Exception must be of type MongoOperationTimeoutException when checking for results"),
                     expectedError.getBoolean("isTimeoutError").getValue(),
-                    e instanceof MongoOperationTimeoutException);
+                    e instanceof MongoOperationTimeoutException || e instanceof MongoExecutionTimeoutException);
         }
 
         if (expectedError.containsKey("errorContains")) {