Skip to content

Commit 512f691

Browse files
committed
sq: test: remove no-longer-applicable skip_if_no_SERVER_89464
1 parent 01b461e commit 512f691

File tree

1 file changed

+13
-28
lines changed

1 file changed

+13
-28
lines changed

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

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -926,19 +926,6 @@ prose_test_10 (void *ctx)
926926
mongoc_client_destroy (client);
927927
}
928928

929-
static int
930-
skip_if_no_SERVER_89464 (void)
931-
{
932-
bool is_mongos = test_framework_is_mongos ();
933-
bool has_SERVER_89464 = test_framework_getenv_bool ("HAS_SERVER_89464");
934-
if (is_mongos && !has_SERVER_89464) {
935-
printf ("Skipping test. Detected mongos without changes of SERVER-89464");
936-
return 0;
937-
}
938-
939-
return 1;
940-
}
941-
942929
static void
943930
capture_all_bulkWrite_commands (const mongoc_apm_command_started_t *event)
944931
{
@@ -1337,20 +1324,19 @@ test_crud_install (TestSuite *suite)
13371324
TestSuite_AddFull (suite,
13381325
"/crud/prose_test_6",
13391326
prose_test_6,
1340-
NULL, /* dtor */
1341-
NULL, /* ctx */
1342-
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+ server */,
1343-
skip_if_no_SERVER_89464);
1327+
NULL, /* dtor */
1328+
NULL, /* ctx */
1329+
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+ server */
1330+
);
13441331

13451332

13461333
TestSuite_AddFull (suite,
13471334
"/crud/prose_test_7",
13481335
prose_test_7,
1349-
NULL, /* dtor */
1350-
NULL, /* ctx */
1351-
test_framework_skip_if_max_wire_version_less_than_25, /* require 8.0+
1352-
server */
1353-
skip_if_no_SERVER_89464);
1336+
NULL, /* dtor */
1337+
NULL, /* ctx */
1338+
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+ server */
1339+
);
13541340

13551341

13561342
TestSuite_AddFull (suite,
@@ -1361,16 +1347,15 @@ test_crud_install (TestSuite *suite)
13611347
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+
13621348
server */
13631349
,
1364-
test_framework_skip_if_single,
1365-
skip_if_no_SERVER_89464);
1350+
test_framework_skip_if_single);
13661351

13671352
TestSuite_AddFull (suite,
13681353
"/crud/prose_test_9",
13691354
prose_test_9,
1370-
NULL, /* dtor */
1371-
NULL, /* ctx */
1372-
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+ server */,
1373-
skip_if_no_SERVER_89464);
1355+
NULL, /* dtor */
1356+
NULL, /* ctx */
1357+
test_framework_skip_if_max_wire_version_less_than_25 /* require 8.0+ server */
1358+
);
13741359

13751360
TestSuite_AddFull (suite,
13761361
"/crud/prose_test_10",

0 commit comments

Comments
 (0)