Skip to content

Commit 14b4f94

Browse files
committed
Revert "evergreen is not a fan of these tests"
This reverts commit b9d79b4. These tests should be functional on evergreen
1 parent dd19725 commit 14b4f94

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

.mci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ functions:
391391
set -o verbose
392392
export ORCHESTRATION_FILE="orchestration_configs/${topology_type}s/${orchestration_file}"
393393
export ORCHESTRATION_URL="http://localhost:8889/v1/${topology_type}s"
394-
export FOREVER_GREEN=1
395394
${set_username_password}
396395
${start_mongo_orchestration}
397396
${start_topology}

tests/test-mongoc-topology.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
#undef MONGOC_LOG_DOMAIN
1515
#define MONGOC_LOG_DOMAIN "topology-test"
1616

17-
static int should_run_topology_tests (void)
18-
{
19-
if (getenv ("FOREVER_GREEN")) {
20-
return 0;
21-
}
22-
return 1;
23-
}
2417

2518
static void
2619
test_topology_client_creation (void)
@@ -238,13 +231,13 @@ _test_server_selection (bool try_once)
238231
}
239232

240233
static void
241-
test_server_selection_try_once (void *context)
234+
test_server_selection_try_once (void)
242235
{
243236
_test_server_selection (true);
244237
}
245238

246239
static void
247-
test_server_selection_try_once_false (void *context)
240+
test_server_selection_try_once_false (void)
248241
{
249242
_test_server_selection (false);
250243
}
@@ -688,21 +681,21 @@ _test_connect_timeout (bool pooled, bool try_once)
688681

689682

690683
static void
691-
test_connect_timeout_pooled (void *context)
684+
test_connect_timeout_pooled (void)
692685
{
693686
_test_connect_timeout (true, false);
694687
}
695688

696689

697690
static void
698-
test_connect_timeout_single(void *context)
691+
test_connect_timeout_single(void)
699692
{
700693
_test_connect_timeout (false, true);
701694
}
702695

703696

704697
static void
705-
test_connect_timeout_try_once_false(void *context)
698+
test_connect_timeout_try_once_false(void)
706699
{
707700
_test_connect_timeout (false, false);
708701
}
@@ -714,14 +707,14 @@ test_topology_install (TestSuite *suite)
714707
TestSuite_Add (suite, "/Topology/client_creation", test_topology_client_creation);
715708
TestSuite_Add (suite, "/Topology/client_pool_creation", test_topology_client_pool_creation);
716709
TestSuite_Add (suite, "/Topology/server_selection_try_once_option", test_server_selection_try_once_option);
717-
TestSuite_AddFull (suite, "/Topology/server_selection_try_once", test_server_selection_try_once, NULL, NULL, should_run_topology_tests);
718-
TestSuite_AddFull (suite, "/Topology/server_selection_try_once_false", test_server_selection_try_once_false, NULL, NULL, should_run_topology_tests);
710+
TestSuite_Add (suite, "/Topology/server_selection_try_once", test_server_selection_try_once);
711+
TestSuite_Add (suite, "/Topology/server_selection_try_once_false", test_server_selection_try_once_false);
719712
TestSuite_Add (suite, "/Topology/invalidate_server", test_topology_invalidate_server);
720713
TestSuite_Add (suite, "/Topology/invalid_cluster_node", test_invalid_cluster_node);
721714
TestSuite_Add (suite, "/Topology/max_wire_version_race_condition", test_max_wire_version_race_condition);
722715
TestSuite_Add (suite, "/Topology/cooldown/standalone", test_cooldown_standalone);
723716
TestSuite_Add (suite, "/Topology/cooldown/rs", test_cooldown_rs);
724-
TestSuite_AddFull (suite, "/Topology/connect_timeout/pooled", test_connect_timeout_pooled, NULL, NULL, should_run_topology_tests);
725-
TestSuite_AddFull (suite, "/Topology/connect_timeout/single/try_once", test_connect_timeout_single, NULL, NULL, should_run_topology_tests);
726-
TestSuite_AddFull (suite, "/Topology/connect_timeout/single/try_once_false", test_connect_timeout_try_once_false, NULL, NULL, should_run_topology_tests);
717+
TestSuite_Add (suite, "/Topology/connect_timeout/pooled", test_connect_timeout_pooled);
718+
TestSuite_Add (suite, "/Topology/connect_timeout/single/try_once", test_connect_timeout_single);
719+
TestSuite_Add (suite, "/Topology/connect_timeout/single/try_once_false", test_connect_timeout_try_once_false);
727720
}

0 commit comments

Comments
 (0)