Skip to content

Commit 344e1ef

Browse files
committed
CDRIVER-3708 unskip tests
1 parent c6e9e4f commit 344e1ef

File tree

5 files changed

+66
-11
lines changed

5 files changed

+66
-11
lines changed

.evergreen/config.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13464,6 +13464,63 @@ tasks:
1346413464
AUTH: noauth
1346513465
DNS: 'on'
1346613466
SSL: ssl
13467+
- name: test-dns-auth-openssl
13468+
depends_on:
13469+
name: debug-compile-sasl-openssl
13470+
commands:
13471+
- func: fetch build
13472+
vars:
13473+
BUILD_NAME: debug-compile-sasl-openssl
13474+
- func: bootstrap mongo-orchestration
13475+
vars:
13476+
AUTH: auth
13477+
SSL: ssl
13478+
TOPOLOGY: replica_set
13479+
VERSION: latest
13480+
AUTHSOURCE: thisDB
13481+
- func: run tests
13482+
vars:
13483+
AUTH: auth
13484+
DNS: dns-auth
13485+
SSL: ssl
13486+
- name: test-dns-auth-winssl
13487+
depends_on:
13488+
name: debug-compile-sspi-winssl
13489+
commands:
13490+
- func: fetch build
13491+
vars:
13492+
BUILD_NAME: debug-compile-sspi-winssl
13493+
- func: bootstrap mongo-orchestration
13494+
vars:
13495+
AUTH: auth
13496+
SSL: ssl
13497+
TOPOLOGY: replica_set
13498+
VERSION: latest
13499+
AUTHSOURCE: thisDB
13500+
- func: run tests
13501+
vars:
13502+
AUTH: auth
13503+
DNS: dns-auth
13504+
SSL: ssl
13505+
- name: test-dns-auth-darwinssl
13506+
depends_on:
13507+
name: debug-compile-sasl-darwinssl
13508+
commands:
13509+
- func: fetch build
13510+
vars:
13511+
BUILD_NAME: debug-compile-sasl-darwinssl
13512+
- func: bootstrap mongo-orchestration
13513+
vars:
13514+
AUTH: auth
13515+
SSL: ssl
13516+
TOPOLOGY: replica_set
13517+
VERSION: latest
13518+
AUTHSOURCE: thisDB
13519+
- func: run tests
13520+
vars:
13521+
AUTH: auth
13522+
DNS: dns-auth
13523+
SSL: ssl
1346713524
- name: test-latest-server-compression-zlib
1346813525
tags:
1346913526
- compression
@@ -16719,6 +16776,7 @@ buildvariants:
1671916776
- .4.2 .openssl !.nosasl .server
1672016777
- .4.0 .openssl !.nosasl .server
1672116778
- test-dns-openssl
16779+
- test-dns-auth-openssl
1672216780
- name: darwin
1672316781
display_name: '*Darwin, macOS (Apple LLVM)'
1672416782
expansions:
@@ -16745,6 +16803,7 @@ buildvariants:
1674516803
- .3.2 .darwinssl !.nosasl .server
1674616804
- .3.2 .nossl
1674716805
- test-dns-darwinssl
16806+
- test-dns-auth-darwinssl
1674816807
- debug-compile-lto
1674916808
- debug-compile-lto-thin
1675016809
- debug-compile-aws
@@ -16779,6 +16838,7 @@ buildvariants:
1677916838
- .nosasl .latest .nossl
1678016839
- .sspi .latest
1678116840
- test-dns-winssl
16841+
- test-dns-auth-winssl
1678216842
- debug-compile-aws
1678316843
- test-aws-openssl-regular-4.4
1678416844
- test-aws-openssl-regular-latest

build/evergreen_config_lib/tasks.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ def _check_allowed(self):
573573

574574

575575
class DNSTask(MatrixTask):
576-
# TODO: CDRIVER-3708, change [False] back to [False, True] to test with auth again.
577-
axes = OD([('auth', [False]),
576+
axes = OD([('auth', [False, True]),
578577
('ssl', ['openssl', 'winssl', 'darwinssl'])])
579578

580579
name_prefix = 'test-dns'

build/evergreen_config_lib/variants.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ def days(n):
290290
'retry-true-latest-server',
291291
'.4.2 .openssl !.nosasl .server',
292292
'.4.0 .openssl !.nosasl .server',
293-
'test-dns-openssl'
294-
# 'test-dns-auth-openssl' TODO CDRIVER-3708 add this back
293+
'test-dns-openssl',
294+
'test-dns-auth-openssl'
295295
],
296296
{'CC': 'gcc'}),
297297
Variant('darwin',
@@ -318,7 +318,7 @@ def days(n):
318318
'.3.2 .darwinssl !.nosasl .server',
319319
'.3.2 .nossl',
320320
'test-dns-darwinssl',
321-
# 'test-dns-auth-darwinssl', TODO CDRIVER-3708 add this back
321+
'test-dns-auth-darwinssl',
322322
'debug-compile-lto',
323323
'debug-compile-lto-thin',
324324
'debug-compile-aws',
@@ -351,7 +351,7 @@ def days(n):
351351
'.nosasl .latest .nossl',
352352
'.sspi .latest',
353353
'test-dns-winssl',
354-
# 'test-dns-auth-winssl', TODO CDRIVER-3708 add this back
354+
'test-dns-auth-winssl',
355355
'debug-compile-aws',
356356
'test-aws-openssl-regular-4.4',
357357
'test-aws-openssl-regular-latest'

src/libmongoc/tests/test-libmongoc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,4 @@ test_framework_skip_if_no_aws (void);
219219
int
220220
test_framework_skip_if_no_setenv (void);
221221

222-
int
223-
test_framework_skip_due_to_cdriver3708 (void);
224-
225222
#endif

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3988,8 +3988,7 @@ test_client_install (TestSuite *suite)
39883988
test_mongoc_client_descriptions_pooled,
39893989
NULL,
39903990
NULL,
3991-
TestSuite_CheckLive,
3992-
test_framework_skip_due_to_cdriver3708);
3991+
TestSuite_CheckLive);
39933992
TestSuite_AddLive (suite,
39943993
"/Client/select_server/single",
39953994
test_mongoc_client_select_server_single);

0 commit comments

Comments
 (0)