Skip to content

Commit 905c71f

Browse files
authored
CDRIVER-3727 unskip /TOPOLOGY/happy_eyeballs* tests (#1413)
* format `test-happy-eyeballs.c` * remove unreferenced `test_happy_eyeballs_retirement` * set `MONGOC_TEST_IPV4_AND_IPV6_HOST` in mock server tests Needed to run the `/TOPOLOGY/happy_eyeballs` tests
1 parent 8a0e9c2 commit 905c71f

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.evergreen/scripts/run-mock-server-tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export MONGOC_TEST_SERVER_LOG="json"
3232
export MONGOC_TEST_SKIP_MOCK="off"
3333
export MONGOC_TEST_SKIP_LIVE="on"
3434
export MONGOC_TEST_SKIP_SLOW="on"
35+
export MONGOC_TEST_IPV4_AND_IPV6_HOST="ipv4_and_ipv6.test.build.10gen.cc"
3536

3637
# shellcheck source=.evergreen/scripts/add-build-dirs-to-paths.sh
3738
. "${script_dir}/add-build-dirs-to-paths.sh"

src/libmongoc/tests/test-happy-eyeballs.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,22 +360,22 @@ _testcase_run (he_testcase_t *testcase)
360360

361361
#define CLIENT(client) \
362362
{ \
363-
#client \
363+
#client \
364364
}
365365

366366
#define CLIENT_WITH_DNS_CACHE_TIMEOUT(type, timeout) \
367367
{ \
368-
#type, timeout \
368+
#type, timeout \
369369
}
370370
#define HANGUP true
371371
#define LISTEN false
372372
#define SERVER(type, hangup) \
373373
{ \
374-
#type, hangup \
374+
#type, hangup \
375375
}
376376
#define DELAYED_SERVER(type, hangup, delay) \
377377
{ \
378-
#type, hangup, delay \
378+
#type, hangup, delay \
379379
}
380380
#define SERVERS(...) \
381381
{ \
@@ -385,7 +385,7 @@ _testcase_run (he_testcase_t *testcase)
385385
#define DURATION_MS(min, max) (min), (max)
386386
#define EXPECT(type, num_acmds, duration) \
387387
{ \
388-
#type, num_acmds, duration \
388+
#type, num_acmds, duration \
389389
}
390390
#define NCMDS(n) (n)
391391

@@ -436,12 +436,6 @@ test_happy_eyeballs_dns_cache (void)
436436
#undef E
437437
}
438438

439-
void
440-
test_happy_eyeballs_retirement (void)
441-
{
442-
/* test connecting to a retired node that fails to initiate a connection. */
443-
}
444-
445439
void
446440
test_happy_eyeballs_install (TestSuite *suite)
447441
{

0 commit comments

Comments
 (0)