Skip to content

Commit bd014ee

Browse files
authored
Skip tests with dots and dollars in field names on 5.0+ (#795)
1 parent fc84fec commit bd014ee

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

src/libmongoc/tests/test-mongoc-collection.c

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4016,7 +4016,7 @@ _test_insert_validate (insert_fn_t insert_fn)
40164016
}
40174017

40184018
static void
4019-
test_insert_bulk_validate (void)
4019+
test_insert_bulk_validate (void *ctx)
40204020
{
40214021
mongoc_client_t *client;
40224022
mongoc_collection_t *collection;
@@ -4067,14 +4067,14 @@ test_insert_bulk_validate (void)
40674067

40684068

40694069
static void
4070-
test_insert_one_validate (void)
4070+
test_insert_one_validate (void *ctx)
40714071
{
40724072
_test_insert_validate (insert_one);
40734073
}
40744074

40754075

40764076
static void
4077-
test_insert_many_validate (void)
4077+
test_insert_many_validate (void *ctx)
40784078
{
40794079
_test_insert_validate (insert_many);
40804080
}
@@ -6674,10 +6674,24 @@ test_collection_install (TestSuite *suite)
66746674
NULL,
66756675
test_framework_skip_if_slow_or_live);
66766676
TestSuite_AddLive (suite, "/Collection/many_return", test_many_return);
6677-
TestSuite_AddLive (
6678-
suite, "/Collection/insert_one_validate", test_insert_one_validate);
6679-
TestSuite_AddLive (
6680-
suite, "/Collection/insert_many_validate", test_insert_many_validate);
6677+
TestSuite_AddFull (
6678+
suite,
6679+
"/Collection/insert_one_validate",
6680+
test_insert_one_validate,
6681+
NULL,
6682+
NULL,
6683+
TestSuite_CheckLive,
6684+
/* TODO: remove checks when removing validation for dots and dollars */
6685+
test_framework_skip_if_max_wire_version_more_than_9);
6686+
TestSuite_AddFull (
6687+
suite,
6688+
"/Collection/insert_many_validate",
6689+
test_insert_many_validate,
6690+
NULL,
6691+
NULL,
6692+
TestSuite_CheckLive,
6693+
/* TODO: remove checks when removing validation for dots and dollars */
6694+
test_framework_skip_if_max_wire_version_more_than_9);
66816695
TestSuite_AddMockServerTest (suite, "/Collection/limit", test_find_limit);
66826696
TestSuite_AddMockServerTest (
66836697
suite, "/Collection/batch_size", test_find_batch_size);
@@ -6729,8 +6743,15 @@ test_collection_install (TestSuite *suite)
67296743
TestSuite_AddLive (suite,
67306744
"/Collection/estimated_document_count_live",
67316745
test_estimated_document_count_live);
6732-
TestSuite_AddLive (
6733-
suite, "/Collection/insert_bulk_validate", test_insert_bulk_validate);
6746+
TestSuite_AddFull (
6747+
suite,
6748+
"/Collection/insert_bulk_validate",
6749+
test_insert_bulk_validate,
6750+
NULL,
6751+
NULL,
6752+
TestSuite_CheckLive,
6753+
/* TODO: remove checks when removing validation for dots and dollars */
6754+
test_framework_skip_if_max_wire_version_more_than_9);
67346755
TestSuite_AddMockServerTest (suite,
67356756
"/Collection/aggregate_with_batch_size",
67366757
test_aggregate_with_batch_size);

0 commit comments

Comments
 (0)