Skip to content

Commit 6441b0e

Browse files
committed
Allow methods in bulk_op_append to fail so expectError can be evaluated
1 parent 52c2954 commit 6441b0e

File tree

1 file changed

+18
-28
lines changed

1 file changed

+18
-28
lines changed

src/libmongoc/tests/unified/operation.c

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -476,63 +476,53 @@ bulk_op_append (mongoc_bulk_operation_t *bulk,
476476
if (!bson_parser_parse (parser, &request_doc, error)) {
477477
goto done;
478478
}
479-
if (!mongoc_bulk_operation_insert_with_opts (
480-
bulk, document, bson_parser_get_extra (parser), error)) {
481-
goto done;
482-
}
479+
480+
mongoc_bulk_operation_insert_with_opts (
481+
bulk, document, bson_parser_get_extra (parser), error);
483482
} else if (0 == strcmp (op_type, "updateOne")) {
484483
bson_parser_doc (parser, "filter", &filter);
485484
bson_parser_array_or_doc (parser, "update", &update);
486485
if (!bson_parser_parse (parser, &request_doc, error)) {
487486
goto done;
488487
}
489-
if (!mongoc_bulk_operation_update_one_with_opts (
490-
bulk, filter, update, bson_parser_get_extra (parser), error)) {
491-
goto done;
492-
}
488+
489+
mongoc_bulk_operation_update_one_with_opts (
490+
bulk, filter, update, bson_parser_get_extra (parser), error);
493491
} else if (0 == strcmp (op_type, "updateMany")) {
494492
bson_parser_doc (parser, "filter", &filter);
495493
bson_parser_array_or_doc (parser, "update", &update);
496494
if (!bson_parser_parse (parser, &request_doc, error)) {
497495
goto done;
498496
}
499-
if (!mongoc_bulk_operation_update_many_with_opts (
500-
bulk, filter, update, bson_parser_get_extra (parser), error)) {
501-
goto done;
502-
}
497+
498+
mongoc_bulk_operation_update_many_with_opts (
499+
bulk, filter, update, bson_parser_get_extra (parser), error);
503500
} else if (0 == strcmp (op_type, "deleteOne")) {
504501
bson_parser_doc (parser, "filter", &filter);
505502

506503
if (!bson_parser_parse (parser, &request_doc, error)) {
507504
goto done;
508505
}
509-
if (!mongoc_bulk_operation_remove_one_with_opts (
510-
bulk, filter, bson_parser_get_extra (parser), error)) {
511-
goto done;
512-
}
506+
507+
mongoc_bulk_operation_remove_one_with_opts (
508+
bulk, filter, bson_parser_get_extra (parser), error);
513509
} else if (0 == strcmp (op_type, "deleteMany")) {
514510
bson_parser_doc (parser, "filter", &filter);
515511
if (!bson_parser_parse (parser, &request_doc, error)) {
516512
goto done;
517513
}
518-
if (!mongoc_bulk_operation_remove_many_with_opts (
519-
bulk, filter, bson_parser_get_extra (parser), error)) {
520-
goto done;
521-
}
514+
515+
mongoc_bulk_operation_remove_many_with_opts (
516+
bulk, filter, bson_parser_get_extra (parser), error);
522517
} else if (0 == strcmp (op_type, "replaceOne")) {
523518
bson_parser_doc (parser, "filter", &filter);
524519
bson_parser_doc (parser, "replacement", &replacement);
525520
if (!bson_parser_parse (parser, &request_doc, error)) {
526521
goto done;
527522
}
528-
if (!mongoc_bulk_operation_replace_one_with_opts (
529-
bulk,
530-
filter,
531-
replacement,
532-
bson_parser_get_extra (parser),
533-
error)) {
534-
goto done;
535-
}
523+
524+
mongoc_bulk_operation_replace_one_with_opts (
525+
bulk, filter, replacement, bson_parser_get_extra (parser), error);
536526
}
537527

538528
ret = true;

0 commit comments

Comments
 (0)