Skip to content

Commit a33e3f0

Browse files
Merge branch 'main' into NODE-7047
2 parents e812267 + 4ab2632 commit a33e3f0

File tree

54 files changed

+211
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+211
-312
lines changed

.eslintrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
{
179179
"patterns": [
180180
"**/../lib/**",
181-
"**/../src/**",
182181
"mongodb-mock-server"
183182
]
184183
}
@@ -217,7 +216,6 @@
217216
{
218217
"patterns": [
219218
"**/../lib/**",
220-
"**/../src/**",
221219
"mongodb-mock-server"
222220
]
223221
}

.evergreen/config.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,19 +1419,6 @@ tasks:
14191419
- func: start-load-balancer
14201420
- func: run-lb-tests
14211421
- func: stop-load-balancer
1422-
- name: test-auth-kerberos
1423-
tags:
1424-
- auth
1425-
- kerberos
1426-
commands:
1427-
- command: expansions.update
1428-
type: setup
1429-
params:
1430-
updates:
1431-
- {key: NATIVE, value: 'true'}
1432-
- func: install dependencies
1433-
- func: assume secrets manager role
1434-
- func: run kerberos tests
14351422
- name: test-auth-ldap
14361423
tags:
14371424
- auth
@@ -2982,7 +2969,6 @@ buildvariants:
29822969
- test-8.0-load-balanced
29832970
- test-rapid-load-balanced
29842971
- test-latest-load-balanced
2985-
- test-auth-kerberos
29862972
- test-auth-ldap
29872973
- test-socks5
29882974
- test-socks5-csfle
@@ -3039,7 +3025,6 @@ buildvariants:
30393025
- test-8.0-load-balanced
30403026
- test-rapid-load-balanced
30413027
- test-latest-load-balanced
3042-
- test-auth-kerberos
30433028
- test-auth-ldap
30443029
- test-socks5
30453030
- test-socks5-csfle
@@ -3096,7 +3081,6 @@ buildvariants:
30963081
- test-8.0-load-balanced
30973082
- test-rapid-load-balanced
30983083
- test-latest-load-balanced
3099-
- test-auth-kerberos
31003084
- test-auth-ldap
31013085
- test-socks5
31023086
- test-socks5-csfle
@@ -3153,7 +3137,6 @@ buildvariants:
31533137
- test-8.0-load-balanced
31543138
- test-rapid-load-balanced
31553139
- test-latest-load-balanced
3156-
- test-auth-kerberos
31573140
- test-auth-ldap
31583141
- test-socks5
31593142
- test-socks5-csfle
@@ -3208,7 +3191,6 @@ buildvariants:
32083191
- test-8.0-load-balanced
32093192
- test-rapid-load-balanced
32103193
- test-latest-load-balanced
3211-
- test-auth-kerberos
32123194
- test-auth-ldap
32133195
- test-socks5-csfle
32143196
- test-socks5-tls

.evergreen/generate_evergreen_tasks.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,19 @@ TASKS.push(
151151
{ func: 'stop-load-balancer' }
152152
]
153153
})),
154-
{
155-
name: 'test-auth-kerberos',
156-
tags: ['auth', 'kerberos'],
157-
commands: [
158-
updateExpansions({
159-
NATIVE: 'true'
160-
}),
161-
{ func: 'install dependencies' },
162-
{ func: 'assume secrets manager role' },
163-
{ func: 'run kerberos tests' }
164-
]
165-
},
154+
// TODO(NODE-7178): Unskip kerberos tests.
155+
// {
156+
// name: 'test-auth-kerberos',
157+
// tags: ['auth', 'kerberos'],
158+
// commands: [
159+
// updateExpansions({
160+
// NATIVE: 'true'
161+
// }),
162+
// { func: 'install dependencies' },
163+
// { func: 'assume secrets manager role' },
164+
// { func: 'run kerberos tests' }
165+
// ]
166+
// },
166167
{
167168
name: 'test-auth-ldap',
168169
tags: ['auth', 'ldap'],

drivers-evergreen-tools

test/benchmarks/unitBench/list.bench.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/* eslint-disable no-restricted-modules */
21
const chalk = require('chalk');
3-
const { List } = require('../../../lib/utils');
2+
const { List } = require('../../../src/utils');
43
const { createHistogram } = require('perf_hooks');
54

65
const iterations = 100;

test/integration/auth/mongodb_aws.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import * as http from 'http';
55
import { performance } from 'perf_hooks';
66
import * as sinon from 'sinon';
77

8-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
98
import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
109
import {
1110
AWSSDKCredentialProvider,

test/integration/bson-decimal128/decimal128.test.js

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { expect } from 'chai';
2+
3+
import { type Collection, Decimal128, type MongoClient } from '../../../src';
4+
5+
describe('Decimal128', function () {
6+
let client: MongoClient;
7+
let collection: Collection;
8+
9+
beforeEach(async function () {
10+
client = this.configuration.newClient();
11+
collection = client.db('decimal128').collection('decimal128');
12+
});
13+
14+
afterEach(async function () {
15+
await client.close();
16+
});
17+
18+
it('should correctly insert decimal128 value', async function () {
19+
const object = {
20+
id: 1,
21+
value: Decimal128.fromString('1.28')
22+
};
23+
await collection.insertOne(object);
24+
const doc = await collection.findOne({
25+
id: 1
26+
});
27+
28+
expect(doc.value).to.be.instanceof(Decimal128);
29+
expect(doc.value.toString()).to.equal('1.28');
30+
});
31+
});

test/integration/client-side-encryption/client_side_encryption.prose.06.corpus.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { expect } from 'chai';
55
import * as fs from 'fs';
66
import * as path from 'path';
77

8-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
98
import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
109
import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
1110
import { type MongoClient, WriteConcern } from '../../mongodb';

test/integration/client-side-encryption/client_side_encryption.prose.12.deadlock.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { expect } from 'chai';
33
import { readFileSync } from 'fs';
44
import * as path from 'path';
55

6-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
76
import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
87
import { type CommandStartedEvent, type MongoClient, type MongoClientOptions } from '../../mongodb';
98
import { type TestConfiguration } from '../../tools/runner/config';

0 commit comments

Comments
 (0)