RUST-1859 Sync bulk write spec tests

src/operation/distinct.rs

@@ -43,13 +43,9 @@ impl OperationWithDefaults for Distinct {
         let mut body = rawdoc! {
             Self::NAME: self.ns.coll.clone(),
             "key": self.field_name.clone(),
+            "query": RawDocumentBuf::from_document(&self.query)?,
         };
 
-        if !self.query.is_empty() {
-            let raw_query: RawDocumentBuf = (&self.query).try_into()?;
-            body.append("query", raw_query);
-        }
-
         append_options_to_raw_document(&mut body, self.options.as_ref())?;
 
         Ok(Command::new_read(

src/operation/insert.rs

@@ -56,6 +56,8 @@ impl<'a> OperationWithDefaults for Insert<'a> {
     const NAME: &'static str = "insert";
 
     fn build(&mut self, description: &StreamDescription) -> Result<Command> {
+        self.inserted_ids.clear();
+
         let max_doc_size: usize = Checked::new(description.max_bson_object_size).try_into()?;
         let max_message_size: usize =
             Checked::new(description.max_message_size_bytes).try_into()?;

src/test/bulk_write.rs

@@ -8,7 +8,6 @@ use crate::{
     test::{
         get_client_options,
         log_uncaptured,
-        spec::unified_runner::run_unified_tests,
         util::fail_point::{FailPoint, FailPointMode},
     },
     Client,
@@ -40,14 +39,6 @@ impl PartialBulkWriteResult {
     }
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn run_unified() {
-    run_unified_tests(&["crud", "unified", "new-bulk-write"])
-        // TODO RUST-1405: unskip this test
-        .skip_files(&["client-bulkWrite-errorResponse.json"])
-        .await;
-}
-
 // CRUD prose test 3
 #[tokio::test]
 async fn max_write_batch_size_batching() {

src/test/spec.rs

@@ -6,7 +6,6 @@ mod collection_management;
 mod command_monitoring;
 mod connection_stepdown;
 mod crud;
-mod crud_v1;
 mod faas;
 mod gridfs;
 mod index_management;

src/test/spec/command_monitoring.rs

@@ -3,6 +3,12 @@ use crate::test::spec::unified_runner::run_unified_tests;
 #[tokio::test(flavor = "multi_thread")]
 async fn command_monitoring_unified() {
     run_unified_tests(&["command-logging-and-monitoring", "monitoring"])
+        .skip_files(&[
+            // TODO RUST-1599: Unskip this file
+            "find.json",
+            // The driver does not support unacknowledged writes.
+            "unacknowledged-client-bulkWrite.json",
+        ])
         .skip_tests(&[
             // This test relies on old OP_QUERY behavior that many drivers still use for < 4.4, but
             // we do not use, due to never implementing OP_QUERY.

src/test/spec/crud.rs

@@ -19,6 +19,14 @@ async fn run_unified() {
             "replaceOne-hint-unacknowledged.json",
             "updateMany-hint-unacknowledged.json",
             "updateOne-hint-unacknowledged.json",
+            // TODO RUST-1405: unskip the errorResponse tests
+            "client-bulkWrite-errorResponse.json",
+            "bulkWrite-errorResponse.json",
+            "updateOne-errorResponse.json",
+            "insertOne-errorResponse.json",
+            "deleteOne-errorResponse.json",
+            "aggregate-merge-errorResponse.json",
+            "findOneAndUpdate-errorResponse.json",
         ])
         .skip_tests(&[
             // Unacknowledged write; see above.