Skip to content

Commit 96ed1d7

Browse files
authored
CDRIVER-4093 fix versioned API sample tests (#848)
- update download-mongodb.sh - create clients in versioned API examples without server API options set
1 parent 3a41062 commit 96ed1d7

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

.evergreen/download-mongodb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ get_mongodb_download_url_for ()
5151
_DISTRO=$1
5252
_VERSION=$2
5353

54-
VERSION_50="5.0.0"
54+
VERSION_50="5.0.2"
5555
VERSION_44="4.4.6"
5656
VERSION_42="4.2.15"
5757
VERSION_40="4.0.25"

src/libmongoc/tests/test-mongoc-sample-commands.c

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525

2626
/* clang-format off */
27+
#include <assert.h>
2728
#include <mongoc/mongoc.h>
2829
#include <mongoc/mongoc-util-private.h>
2930
#include <mongoc/mongoc-database-private.h>
@@ -3435,6 +3436,20 @@ get_client (void)
34353436
return test_framework_new_default_client ();
34363437
}
34373438

3439+
/* Returns a test client without version API options configured. */
3440+
static mongoc_client_t *
3441+
get_client_for_version_api_example (void) {
3442+
mongoc_client_t *client;
3443+
mongoc_uri_t *uri;
3444+
3445+
uri = test_framework_get_uri ();
3446+
client = mongoc_client_new_from_uri (uri);
3447+
ASSERT (client);
3448+
test_framework_set_ssl_opts (client);
3449+
mongoc_uri_destroy (uri);
3450+
return client;
3451+
}
3452+
34383453
static bool
34393454
callback (mongoc_client_session_t *session,
34403455
void *ctx,
@@ -3592,12 +3607,13 @@ _test_sample_versioned_api_example_1 (void)
35923607
* client = mongoc_client_new (uri_sharded);
35933608
*/
35943609

3595-
client = get_client ();
3610+
/* Create a mongoc_client_t without server API options configured. */
3611+
client = get_client_for_version_api_example ();
35963612

35973613
mongoc_server_api_version_from_string ("1", &server_api_version);
35983614
server_api = mongoc_server_api_new (server_api_version);
35993615

3600-
mongoc_client_set_server_api (client, server_api, &error);
3616+
assert (mongoc_client_set_server_api (client, server_api, &error));
36013617
/* End Versioned API Example 1 */
36023618

36033619
mongoc_client_destroy (client);
@@ -3624,13 +3640,14 @@ _test_sample_versioned_api_example_2 (void)
36243640
* client = mongoc_client_new (uri_sharded);
36253641
*/
36263642

3627-
client = get_client ();
3643+
/* Create a mongoc_client_t without server API options configured. */
3644+
client = get_client_for_version_api_example ();
36283645

36293646
mongoc_server_api_version_from_string ("1", &server_api_version);
36303647
server_api = mongoc_server_api_new (server_api_version);
36313648
mongoc_server_api_strict (server_api, true);
36323649

3633-
mongoc_client_set_server_api (client, server_api, &error);
3650+
assert (mongoc_client_set_server_api (client, server_api, &error));
36343651
/* End Versioned API Example 2 */
36353652

36363653
mongoc_client_destroy (client);
@@ -3657,13 +3674,14 @@ _test_sample_versioned_api_example_3 (void)
36573674
* client = mongoc_client_new (uri_sharded);
36583675
*/
36593676

3660-
client = get_client ();
3677+
/* Create a mongoc_client_t without server API options configured. */
3678+
client = get_client_for_version_api_example ();
36613679

36623680
mongoc_server_api_version_from_string ("1", &server_api_version);
36633681
server_api = mongoc_server_api_new (server_api_version);
36643682
mongoc_server_api_strict (server_api, false);
36653683

3666-
mongoc_client_set_server_api (client, server_api, &error);
3684+
assert (mongoc_client_set_server_api (client, server_api, &error));
36673685
/* End Versioned API Example 3 */
36683686

36693687
mongoc_client_destroy (client);
@@ -3690,13 +3708,14 @@ _test_sample_versioned_api_example_4 (void)
36903708
* client = mongoc_client_new (uri_sharded);
36913709
*/
36923710

3693-
client = get_client ();
3711+
/* Create a mongoc_client_t without server API options configured. */
3712+
client = get_client_for_version_api_example ();
36943713

36953714
mongoc_server_api_version_from_string ("1", &server_api_version);
36963715
server_api = mongoc_server_api_new (server_api_version);
36973716
mongoc_server_api_deprecation_errors (server_api, true);
36983717

3699-
mongoc_client_set_server_api (client, server_api, &error);
3718+
assert (mongoc_client_set_server_api (client, server_api, &error));
37003719
/* End Versioned API Example 4 */
37013720

37023721
mongoc_client_destroy (client);
@@ -3725,7 +3744,8 @@ static void _test_sample_versioned_api_example_5_6_7_8 (void) {
37253744
int64_t count;
37263745
bson_t *filter;
37273746

3728-
client = get_client ();
3747+
/* Create a mongoc_client_t without server API options configured. */
3748+
client = get_client_for_version_api_example ();
37293749
mongoc_client_set_error_api (client, MONGOC_ERROR_API_VERSION_2);
37303750
mongoc_server_api_version_from_string ("1", &server_api_version);
37313751
server_api = mongoc_server_api_new (server_api_version);

0 commit comments

Comments
 (0)