Skip to content

Commit fc8d79a

Browse files
authored
CDRIVER-3549 remove unused test_framework_skip_if_time_sensitive (#1415)
1 parent 3cf2194 commit fc8d79a

File tree

6 files changed

+10
-46
lines changed

6 files changed

+10
-46
lines changed

src/libmongoc/tests/test-libmongoc.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,17 +2533,6 @@ test_framework_skip_if_serverless (void)
25332533
return 1; // proceed.
25342534
}
25352535

2536-
int
2537-
test_framework_skip_if_time_sensitive (void)
2538-
{
2539-
/* Skip time sensitive tests on macOS per CDRIVER-3549. */
2540-
#ifdef __APPLE__
2541-
return 0;
2542-
#else
2543-
return 1;
2544-
#endif
2545-
}
2546-
25472536
int
25482537
test_framework_skip_due_to_cdriver3708 (void)
25492538
{

src/libmongoc/tests/test-libmongoc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,6 @@ test_framework_skip_if_no_failpoint (void);
259259
int
260260
test_framework_skip_if_no_client_side_encryption (void);
261261

262-
int
263-
test_framework_skip_if_time_sensitive (void);
264-
265262
int
266263
test_framework_skip_if_no_aws (void);
267264

src/libmongoc/tests/test-mongoc-sdam-monitoring.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,12 +1050,10 @@ test_sdam_monitoring_install (TestSuite *suite)
10501050
suite,
10511051
"/server_discovery_and_monitoring/monitoring/heartbeat/pooled/succeeded",
10521052
test_heartbeat_events_pooled_succeeded);
1053-
_TestSuite_AddMockServerTest (
1053+
TestSuite_AddMockServerTest (
10541054
suite,
10551055
"/server_discovery_and_monitoring/monitoring/heartbeat/pooled/failed",
1056-
test_heartbeat_events_pooled_failed,
1057-
test_framework_skip_if_time_sensitive,
1058-
NULL);
1056+
test_heartbeat_events_pooled_failed);
10591057
TestSuite_AddFull (
10601058
suite,
10611059
"/server_discovery_and_monitoring/monitoring/heartbeat/single/dns",

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55

66

77
static void
8-
test_cond_wait (void *unused)
8+
test_cond_wait (void)
99
{
1010
int64_t start, duration_usec;
1111
bson_mutex_t mutex;
1212
mongoc_cond_t cond;
1313

14-
BSON_UNUSED (unused);
15-
1614
bson_mutex_init (&mutex);
1715
mongoc_cond_init (&cond);
1816

@@ -35,10 +33,5 @@ test_cond_wait (void *unused)
3533
void
3634
test_thread_install (TestSuite *suite)
3735
{
38-
TestSuite_AddFull (suite,
39-
"/Thread/cond_wait",
40-
test_cond_wait,
41-
NULL /* dtor */,
42-
NULL /* ctx */,
43-
test_framework_skip_if_time_sensitive);
36+
TestSuite_Add (suite, "/Thread/cond_wait", test_cond_wait);
4437
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2838,16 +2838,10 @@ test_topology_install (TestSuite *suite)
28382838
NULL,
28392839
NULL,
28402840
test_framework_skip_if_offline);
2841-
_TestSuite_AddMockServerTest (suite,
2842-
"/Topology/connect_timeout/succeed",
2843-
test_select_after_timeout,
2844-
test_framework_skip_if_time_sensitive,
2845-
NULL);
2846-
_TestSuite_AddMockServerTest (suite,
2847-
"/Topology/try_once/succeed",
2848-
test_select_after_try_once,
2849-
test_framework_skip_if_time_sensitive,
2850-
NULL);
2841+
TestSuite_AddMockServerTest (
2842+
suite, "/Topology/connect_timeout/succeed", test_select_after_timeout);
2843+
TestSuite_AddMockServerTest (
2844+
suite, "/Topology/try_once/succeed", test_select_after_try_once);
28512845
TestSuite_AddLive (
28522846
suite, "/Topology/invalid_server_id", test_invalid_server_id);
28532847
TestSuite_AddMockServerTest (suite,

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44

55

66
static void
7-
test_mongoc_usleep_basic (void *unused)
7+
test_mongoc_usleep_basic (void)
88
{
99
int64_t start;
1010
int64_t duration;
1111

12-
BSON_UNUSED (unused);
13-
1412
start = bson_get_monotonic_time ();
1513
_mongoc_usleep (50 * 1000); /* 50 ms */
1614
duration = bson_get_monotonic_time () - start;
@@ -21,10 +19,5 @@ test_mongoc_usleep_basic (void *unused)
2119
void
2220
test_usleep_install (TestSuite *suite)
2321
{
24-
TestSuite_AddFull (suite,
25-
"/Sleep/basic",
26-
test_mongoc_usleep_basic,
27-
NULL /* dtor */,
28-
NULL /* dtor */,
29-
test_framework_skip_if_time_sensitive);
22+
TestSuite_Add (suite, "/Sleep/basic", test_mongoc_usleep_basic);
3023
}

0 commit comments

Comments
 (0)