diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index c9eb51a7559..9cd0e813fc5 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -388,20 +388,6 @@ functions: args: - .evergreen/run-ldap-tests.sh - "run data lake tests": - - command: subprocess.exec - type: test - params: - working_dir: src - binary: bash - env: - PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - MONGODB_URI: "mongodb://mhuser:pencil@localhost" - NODE_LTS_VERSION: ${NODE_LTS_VERSION} - args: - - .evergreen/run-data-lake-tests.sh - "run tls tests": - command: shell.exec type: test @@ -715,13 +701,6 @@ functions: - .evergreen/docker/alpine.sh tasks: - - name: "test-atlas-data-lake" - tags: ["datalake", "mongohouse"] - commands: - - func: "install dependencies" - - func: "bootstrap mongohoused" - - func: "run data lake tests" - - name: "test-gcpkms-task" commands: - command: expansions.update diff --git a/.evergreen/config.yml b/.evergreen/config.yml index c05f3fa7f34..920d0defc9b 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -345,19 +345,6 @@ functions: NODE_LTS_VERSION: ${NODE_LTS_VERSION} args: - .evergreen/run-ldap-tests.sh - run data lake tests: - - command: subprocess.exec - type: test - params: - working_dir: src - binary: bash - env: - PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} - DRIVERS_TOOLS: ${DRIVERS_TOOLS} - MONGODB_URI: mongodb://mhuser:pencil@localhost - NODE_LTS_VERSION: ${NODE_LTS_VERSION} - args: - - .evergreen/run-data-lake-tests.sh run tls tests: - command: shell.exec type: test @@ -650,14 +637,6 @@ functions: args: - .evergreen/docker/alpine.sh tasks: - - name: test-atlas-data-lake - tags: - - datalake - - mongohouse - commands: - - func: install dependencies - - func: bootstrap mongohoused - - func: run data lake tests - name: test-gcpkms-task commands: - command: expansions.update @@ -3456,13 +3435,6 @@ buildvariants: - aws-latest-auth-test-run-aws-ECS-auth-test - aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-unset - aws-latest-auth-test-run-aws-auth-test-AssumeRoleWithWebIdentity-with-AWS_ROLE_SESSION_NAME-set - - name: ubuntu2204-test-atlas-data-lake - display_name: Atlas Data Lake Tests - run_on: ubuntu2204-large - expansions: - NODE_LTS_VERSION: 22 - tasks: - - test-atlas-data-lake - name: performance-tests display_name: Performance Test run_on: rhel90-dbx-perf-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 9896ea86079..6f10ff734be 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -620,16 +620,6 @@ BUILD_VARIANTS.push({ tasks: AWS_AUTH_TASKS }); -BUILD_VARIANTS.push({ - name: 'ubuntu2204-test-atlas-data-lake', - display_name: 'Atlas Data Lake Tests', - run_on: UBUNTU_22_OS, - expansions: { - NODE_LTS_VERSION: LATEST_LTS - }, - tasks: ['test-atlas-data-lake'] -}); - const customDependencyTests = []; for (const serverVersion of ['5.0', 'rapid', 'latest']) { diff --git a/.evergreen/run-data-lake-tests.sh b/.evergreen/run-data-lake-tests.sh deleted file mode 100644 index 6f2d9608b43..00000000000 --- a/.evergreen/run-data-lake-tests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -o errexit # Exit the script with error if any of the commands fail - -source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh - -echo "$MONGODB_URI" -npm run check:adl diff --git a/package.json b/package.json index 700b0a349fb..2cb391ecc99 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,6 @@ "check:atlas": "nyc mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts", "check:resource-management": "nyc mocha --config test/manual/mocharc.js test/manual/resource_management.test.ts", "check:drivers-atlas-testing": "nyc mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts", - "check:adl": "nyc mocha --config test/mocha_mongodb.js test/manual/atlas-data-lake-testing", "check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts", "check:oidc-auth": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts", "check:oidc-test": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts", diff --git a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js b/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js deleted file mode 100644 index 262539668b5..00000000000 --- a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js +++ /dev/null @@ -1,68 +0,0 @@ -'use strict'; -const { MongoClient } = require('../../mongodb'); - -// TODO(NODE-3880): These tests are not fully implemented per the spec -describe('Atlas Data Lake - prose', function () { - let client; - - beforeEach(function () { - client = null; - }); - - afterEach(async function () { - if (client != null) await client.close(); - }); - - /** - * For this test, configure an APM listener on a client and execute a query on the test.driverdata collection - * that will leave a cursor open on the server (e.g. specify batchSize=2 for a query that would match 3+ documents). - * Drivers MAY iterate the cursor if necessary to execute the initial find command but MUST NOT iterate further to avoid executing a getMore. - * - * Observe the CommandSucceededEvent event for the find command and extract the cursor's ID and namespace from the response document's cursor.id - * and cursor.ns fields, respectively. Destroy the cursor object and observe a CommandStartedEvent and CommandSucceededEvent for the killCursors command. - * - * Assert that the cursor ID and target namespace in the outgoing command match the values from the find command's CommandSucceededEvent. - * When matching the namespace, note that the killCursors field will contain the collection name and the database may be inferred from either - * the $db field or accessed via the CommandStartedEvent directly. - * - * Finally, assert that the killCursors CommandSucceededEvent indicates that the expected cursor was killed in the cursorsKilled field. - * - * Note: this test assumes that drivers only issue a killCursors command internally when destroying a cursor that may still exist on the server. - * If a driver constructs and issues killCursors commands in other ways (e.g. public API), this test MUST be adapted to test all such code paths. - */ - it('1. Test that the driver properly constructs and issues a killCursors command to Atlas Data Lake.', async function () { - client = new MongoClient('mongodb://mhuser:pencil@localhost'); - const db = client.db('admin'); - await db.command({ killCursors: 'kill_cursor_collection' }); - }); - - /** - * For these tests, create a MongoClient using a valid connection string without auth credentials and execute a ping command. - */ - it('2. Test that the driver can establish a connection with Atlas Data Lake without authentication.', async function () { - client = new MongoClient('mongodb://localhost'); - const db = client.db('admin'); - await db.command({ ping: 1 }); - }); - - /** - * For these tests, create a MongoClient using a valid connection string with SCRAM-SHA-1 and credentials - * from the drivers-evergreen-tools ADL configuration and execute a ping command. - */ - it('3a. Test that the driver can establish a connection with Atlas Data Lake with authentication. (SCRAM-SHA-1)', async function () { - client = new MongoClient('mongodb://mhuser:pencil@localhost?authMechanism=SCRAM-SHA-1'); - const db = client.db('admin'); - await db.command({ ping: 1 }); - await db.command({ killCursors: 'kill_cursor_collection' }); - }); - - /** - * Repeat the authentication test using SCRAM-SHA-256. - */ - it('3b. Test that the driver can establish a connection with Atlas Data Lake with authentication. (SCRAM-SHA-256)', async function () { - client = new MongoClient('mongodb://mhuser:pencil@localhost?authMechanism=SCRAM-SHA-256'); - const db = client.db('admin'); - await db.command({ ping: 1 }); - await db.command({ killCursors: 'kill_cursor_collection' }); - }); -}); diff --git a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.spec.ts b/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.spec.ts deleted file mode 100644 index 62f3d2e2c2d..00000000000 --- a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.spec.ts +++ /dev/null @@ -1,8 +0,0 @@ -import * as path from 'path'; - -import { loadSpecTests } from '../../spec'; -import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner'; - -describe('Atlas Data Lake Unified Tests', function () { - runUnifiedSuite(loadSpecTests(path.join('atlas-data-lake-testing', 'unified'))); -}); diff --git a/test/readme.md b/test/readme.md index 47701d39927..de47c141661 100644 --- a/test/readme.md +++ b/test/readme.md @@ -63,7 +63,7 @@ Below is a summary of the types of test automation in this repo. | Unit | `/test/unit` | The unit tests test individual pieces of code, typically functions. These tests do **not** interact with a real database, so mocks are used instead.

The unit test directory mirrors the `/src` directory structure with test file names matching the source file names of the code they test. | `npm run check:unit` | | Integration | `/test/integration` | The integration tests test that a given feature or piece of a feature is working as expected. These tests do **not** use mocks; instead, they interact with a real database.

The integration test directory follows the `test/spec` directory structure representing the different functional areas of the driver.

**Note:** The `.gitkeep` files are intentionally left to ensure that this directory structure is preserved even as the actual test files are moved around. | `npm run check:test` | | Benchmark | `/test/benchmarks` | The benchmark tests report how long a designated set of tests take to run. They are used to measure performance. | `npm run check:bench` | -| Specialized Environment | `/test/manual` | The specalized environment tests are functional tests that require specialized environment setups in Evergreen.

**Note**: "manual" in the directory path does not refer to tests that should be run manually. These tests are automated. These tests have a special Evergreen configuration and run in isolation from the other tests. | There is no single script for running all of the specialized environment tests. Instead, you can run the appropriate script based on the specialized environment you want to use:
- `npm run check:atlas` to test Atlas
- `npm run check:adl` to test Atlas Data Lake
- `npm run check:kerberos` to test Kerberos
- `npm run check:tls` to test TLS
- `npm run check:ldap` to test LDAP authorization | +| Specialized Environment | `/test/manual` | The specalized environment tests are functional tests that require specialized environment setups in Evergreen.

**Note**: "manual" in the directory path does not refer to tests that should be run manually. These tests are automated. These tests have a special Evergreen configuration and run in isolation from the other tests. | There is no single script for running all of the specialized environment tests. Instead, you can run the appropriate script based on the specialized environment you want to use:
- `npm run check:atlas` to test Atlas
- `npm run check:kerberos` to test Kerberos
- `npm run check:tls` to test TLS
- `npm run check:ldap` to test LDAP authorization | | TypeScript Definition | `/test/types` | The TypeScript definition tests verify the type definitions are correct. | `npm run check:tsd` | | GitHub Actions | `/test/action` | Tests that run as GitHub Actions such as dependency checking. | Currently, only `npm run check:dependencies` but could be expanded to more in the future. | | Code Examples | `/test/integration/node-specific/examples` | Code examples that are also paired with tests that show they are working examples. | Currently, `npm run check:lambda` to test the AWS Lambda example with default auth and `npm run check:lambda:aws` to test the AWS Lambda example with AWS auth. | @@ -676,7 +676,6 @@ needs to be tested. ### TODO Special Env Sections - TLS -- Atlas Data Lake - LDAP - Snappy (maybe in general, how to test optional dependencies) - Atlas connectivity diff --git a/test/spec/atlas-data-lake-testing/README.md b/test/spec/atlas-data-lake-testing/README.md deleted file mode 100644 index f6ade52de1d..00000000000 --- a/test/spec/atlas-data-lake-testing/README.md +++ /dev/null @@ -1,70 +0,0 @@ -# Atlas Data Lake Tests - -## Introduction - -The YAML and JSON files in this directory are platform-independent tests that drivers can use to assert compatibility -with [Atlas Data Lake](https://www.mongodb.com/docs/datalake/). These tests utilize the -[Unified Test Format](../../unified-test-format/unified-test-format.md). - -Several prose tests, which are not easily expressed in YAML, are also presented in this file. Those tests will need to -be manually implemented by each driver. - -## Test Considerations - -Running these integration tests will require a running `mongohoused` with data available in its `test.driverdata` -collection. See the -[ADL directory in drivers-evergreen-tools](https://github.com/mongodb-labs/drivers-evergreen-tools/tree/master/.evergreen/atlas_data_lake) -and [10gen/mongohouse README](https://github.com/10gen/mongohouse/blob/master/README.md) for more information. - -The test runner for Atlas Data Lake testing MUST NOT drop the collection and/or database under test. In contrast to most -other tests, which insert their own data fixtures into an empty collection, the data for these tests is specified in the -`mongohoused` configuration file. - -Additionally, the test runner MUST NOT execute `killAllSessions` (see: -[Terminating Open Transactions](../../unified-test-format/unified-test-format.md#terminating-open-transactions)) when -connected to Atlas Data Lake. - -## Prose Tests - -The following tests MUST be implemented to fully test compatibility with Atlas Data Lake. - -### 1. Support for `killCursors` command - -Test that the driver properly constructs and issues a -[killCursors](https://www.mongodb.com/docs/manual/reference/command/killCursors/) command to Atlas Data Lake. For this -test, configure an APM listener on a client and execute a query on the `test.driverdata` collection that will leave a -cursor open on the server (e.g. specify `batchSize=2` for a query that would match 3+ documents). Drivers MAY iterate -the cursor if necessary to execute the initial `find` command but MUST NOT iterate further to avoid executing a -`getMore`. - -Observe the CommandSucceededEvent event for the `find` command and extract the cursor's ID and namespace from the -response document's `cursor.id` and `cursor.ns` fields, respectively. Destroy the cursor object and observe a -CommandStartedEvent and CommandSucceededEvent for the `killCursors` command. Assert that the cursor ID and target -namespace in the outgoing command match the values from the `find` command's CommandSucceededEvent. When matching the -namespace, note that the `killCursors` field will contain the collection name and the database may be inferred from -either the `$db` field or accessed via the CommandStartedEvent directly. Finally, assert that the `killCursors` -CommandSucceededEvent indicates that the expected cursor was killed in the `cursorsKilled` field. - -Note: this test assumes that drivers only issue a `killCursors` command internally when destroying a cursor that may -still exist on the server. If a driver constructs and issues `killCursors` commands in other ways (e.g. public API), -this test MUST be adapted to test all such code paths. - -### 2. Connect without authentication - -Test that the driver can establish a connection with Atlas Data Lake without authentication. For these tests, create a -MongoClient using a valid connection string without auth credentials and execute a ping command. - -### 3. Connect with authentication - -Test that the driver can establish a connection with Atlas Data Lake with authentication. For these tests, create a -MongoClient using a valid connection string with SCRAM-SHA-1 and credentials from the drivers-evergreen-tools ADL -configuration and execute a ping command. Repeat this test using SCRAM-SHA-256. - -## Changelog - -- 2024-03-08: Convert legacy ADL tests to unified format. Convert test README from reStructuredText to Markdown. - -- 2022-10-05: Add spec front matter - -- 2020-07-15: Link to CRUD test runner implementation and note that the collection under test must not be dropped before - each test. diff --git a/test/spec/atlas-data-lake-testing/unified/aggregate.json b/test/spec/atlas-data-lake-testing/unified/aggregate.json deleted file mode 100644 index 68a3467c71c..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/aggregate.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "description": "aggregate", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - }, - { - "collection": { - "id": "collection0", - "database": "database0", - "collectionName": "driverdata" - } - } - ], - "tests": [ - { - "description": "Aggregate with pipeline (project, sort, limit)", - "operations": [ - { - "object": "collection0", - "name": "aggregate", - "arguments": { - "pipeline": [ - { - "$project": { - "_id": 0 - } - }, - { - "$sort": { - "a": 1 - } - }, - { - "$limit": 2 - } - ] - }, - "expectResult": [ - { - "a": 1, - "b": 2, - "c": 3 - }, - { - "a": 2, - "b": 3, - "c": 4 - } - ] - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "aggregate": "driverdata" - }, - "commandName": "aggregate", - "databaseName": "test" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/aggregate.yml b/test/spec/atlas-data-lake-testing/unified/aggregate.yml deleted file mode 100644 index 54bad5aeaae..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/aggregate.yml +++ /dev/null @@ -1,38 +0,0 @@ -description: "aggregate" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - - collection: - id: &collection0 collection0 - database: *database0 - collectionName: &collection0Name driverdata - -tests: - - description: "Aggregate with pipeline (project, sort, limit)" - operations: - - object: *collection0 - name: aggregate - arguments: - pipeline: - - $project: { _id: 0 } - - $sort: { a: 1 } - - $limit: 2 - expectResult: - - { a: 1, b: 2, c: 3 } - - { a: 2, b: 3, c: 4 } - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - aggregate: *collection0Name - commandName: aggregate - databaseName: *database0Name diff --git a/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.json b/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.json deleted file mode 100644 index b7515a44182..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "description": "estimatedDocumentCount", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - }, - { - "collection": { - "id": "collection0", - "database": "database0", - "collectionName": "driverdata" - } - } - ], - "tests": [ - { - "description": "estimatedDocumentCount succeeds", - "operations": [ - { - "object": "collection0", - "name": "estimatedDocumentCount", - "expectResult": 15 - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "count": "driverdata" - }, - "commandName": "count", - "databaseName": "test" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.yml b/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.yml deleted file mode 100644 index fe3c353879c..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/estimatedDocumentCount.yml +++ /dev/null @@ -1,31 +0,0 @@ -description: "estimatedDocumentCount" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - - collection: - id: &collection0 collection0 - database: *database0 - collectionName: &collection0Name driverdata - -tests: - - description: "estimatedDocumentCount succeeds" - operations: - - object: *collection0 - name: estimatedDocumentCount - expectResult: 15 - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - count: *collection0Name - commandName: count - databaseName: *database0Name diff --git a/test/spec/atlas-data-lake-testing/unified/find.json b/test/spec/atlas-data-lake-testing/unified/find.json deleted file mode 100644 index d0652dc720f..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/find.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "description": "find", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - }, - { - "collection": { - "id": "collection0", - "database": "database0", - "collectionName": "driverdata" - } - } - ], - "tests": [ - { - "description": "Find with projection and sort", - "operations": [ - { - "object": "collection0", - "name": "find", - "arguments": { - "filter": { - "b": { - "$gt": 5 - } - }, - "projection": { - "_id": 0 - }, - "sort": { - "a": 1 - }, - "limit": 5 - }, - "expectResult": [ - { - "a": 5, - "b": 6, - "c": 7 - }, - { - "a": 6, - "b": 7, - "c": 8 - }, - { - "a": 7, - "b": 8, - "c": 9 - }, - { - "a": 8, - "b": 9, - "c": 10 - }, - { - "a": 9, - "b": 10, - "c": 11 - } - ] - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "find": "driverdata" - }, - "commandName": "find", - "databaseName": "test" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/find.yml b/test/spec/atlas-data-lake-testing/unified/find.yml deleted file mode 100644 index 10384f78f4c..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/find.yml +++ /dev/null @@ -1,41 +0,0 @@ -description: "find" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - - collection: - id: &collection0 collection0 - database: *database0 - collectionName: &collection0Name driverdata - -tests: - - description: "Find with projection and sort" - operations: - - object: *collection0 - name: find - arguments: - filter: { b: { $gt: 5 } } - projection: { _id: 0 } - sort: { a: 1 } - limit: 5 - expectResult: - - { a: 5, b: 6, c: 7 } - - { a: 6, b: 7, c: 8 } - - { a: 7, b: 8, c: 9 } - - { a: 8, b: 9, c: 10 } - - { a: 9, b: 10, c: 11 } - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - find: *collection0Name - commandName: find - databaseName: *database0Name diff --git a/test/spec/atlas-data-lake-testing/unified/getMore.json b/test/spec/atlas-data-lake-testing/unified/getMore.json deleted file mode 100644 index 109b6d3d8e7..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/getMore.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "description": "getMore", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - }, - { - "collection": { - "id": "collection0", - "database": "database0", - "collectionName": "driverdata" - } - } - ], - "tests": [ - { - "description": "A successful find event with getMore", - "operations": [ - { - "object": "collection0", - "name": "find", - "arguments": { - "filter": { - "a": { - "$gte": 2 - } - }, - "sort": { - "a": 1 - }, - "batchSize": 3, - "limit": 4 - } - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "find": "driverdata", - "filter": { - "a": { - "$gte": 2 - } - }, - "sort": { - "a": 1 - }, - "batchSize": 3, - "limit": 4 - }, - "commandName": "find", - "databaseName": "test" - } - }, - { - "commandStartedEvent": { - "command": { - "getMore": { - "$$type": [ - "int", - "long" - ] - }, - "collection": { - "$$type": "string" - }, - "batchSize": 1 - }, - "commandName": "getMore", - "databaseName": "cursors" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/getMore.yml b/test/spec/atlas-data-lake-testing/unified/getMore.yml deleted file mode 100644 index f02fbfe9a18..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/getMore.yml +++ /dev/null @@ -1,48 +0,0 @@ -description: "getMore" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - - collection: - id: &collection0 collection0 - database: *database0 - collectionName: &collection0Name driverdata - -tests: - - description: "A successful find event with getMore" - operations: - - object: *collection0 - name: find - arguments: - filter: { a: { $gte: 2 } } - sort: { a: 1 } - batchSize: 3 - limit: 4 - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - find: *collection0Name - filter: { a: { $gte : 2 } } - sort: { a: 1 } - batchSize: 3 - limit: 4 - commandName: find - databaseName: *database0Name - - commandStartedEvent: - command: - getMore: { $$type: [ int, long ] } - # collection name will be an internal identifier - collection: { $$type: string } - batchSize: 1 - commandName: getMore - # mongohoused always expects getMores on the "cursors" database - databaseName: cursors diff --git a/test/spec/atlas-data-lake-testing/unified/listCollections.json b/test/spec/atlas-data-lake-testing/unified/listCollections.json deleted file mode 100644 index 642e7ed328a..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/listCollections.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "description": "listCollections", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - } - ], - "tests": [ - { - "description": "ListCollections succeeds", - "operations": [ - { - "object": "database0", - "name": "listCollections" - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "listCollections": 1 - }, - "commandName": "listCollections", - "databaseName": "test" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/listCollections.yml b/test/spec/atlas-data-lake-testing/unified/listCollections.yml deleted file mode 100644 index 2b9cd1cc94f..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/listCollections.yml +++ /dev/null @@ -1,26 +0,0 @@ -description: "listCollections" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - -tests: - - description: "ListCollections succeeds" - operations: - - object: *database0 - name: listCollections - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - listCollections: 1 - commandName: listCollections - databaseName: *database0Name diff --git a/test/spec/atlas-data-lake-testing/unified/listDatabases.json b/test/spec/atlas-data-lake-testing/unified/listDatabases.json deleted file mode 100644 index 64506ee54e4..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/listDatabases.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "description": "listDatabases", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - } - ], - "tests": [ - { - "description": "ListCollections succeeds", - "operations": [ - { - "object": "client0", - "name": "listDatabases" - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "listDatabases": 1 - }, - "commandName": "listDatabases", - "databaseName": "admin" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/listDatabases.yml b/test/spec/atlas-data-lake-testing/unified/listDatabases.yml deleted file mode 100644 index cb70ee6c73f..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/listDatabases.yml +++ /dev/null @@ -1,22 +0,0 @@ -description: "listDatabases" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - -tests: - - description: "ListCollections succeeds" - operations: - - object: *client0 - name: listDatabases - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - listDatabases: 1 - commandName: listDatabases - databaseName: admin diff --git a/test/spec/atlas-data-lake-testing/unified/runCommand.json b/test/spec/atlas-data-lake-testing/unified/runCommand.json deleted file mode 100644 index 325b6b3f30a..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/runCommand.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "description": "runCommand", - "schemaVersion": "1.0", - "createEntities": [ - { - "client": { - "id": "client0", - "observeEvents": [ - "commandStartedEvent" - ] - } - }, - { - "database": { - "id": "database0", - "client": "client0", - "databaseName": "test" - } - } - ], - "tests": [ - { - "description": "ping succeeds using runCommand", - "operations": [ - { - "object": "database0", - "name": "runCommand", - "arguments": { - "command": { - "ping": 1 - }, - "commandName": "ping" - } - } - ], - "expectEvents": [ - { - "client": "client0", - "events": [ - { - "commandStartedEvent": { - "command": { - "ping": 1 - }, - "commandName": "ping", - "databaseName": "test" - } - } - ] - } - ] - } - ] -} diff --git a/test/spec/atlas-data-lake-testing/unified/runCommand.yml b/test/spec/atlas-data-lake-testing/unified/runCommand.yml deleted file mode 100644 index 8ab0d7b478d..00000000000 --- a/test/spec/atlas-data-lake-testing/unified/runCommand.yml +++ /dev/null @@ -1,29 +0,0 @@ -description: "runCommand" - -schemaVersion: "1.0" - -createEntities: - - client: - id: &client0 client0 - observeEvents: [ commandStartedEvent ] - - database: - id: &database0 database0 - client: *client0 - databaseName: &database0Name test - -tests: - - description: "ping succeeds using runCommand" - operations: - - object: *database0 - name: runCommand - arguments: - command: { ping: 1 } - commandName: ping - expectEvents: - - client: *client0 - events: - - commandStartedEvent: - command: - ping: 1 - commandName: ping - databaseName: *database0Name diff --git a/test/tools/runner/hooks/configuration.ts b/test/tools/runner/hooks/configuration.ts index 4f9522e5222..e5c6547902e 100644 --- a/test/tools/runner/hooks/configuration.ts +++ b/test/tools/runner/hooks/configuration.ts @@ -167,9 +167,6 @@ const testConfigBeforeHook = async function () { aws: MONGODB_URI.includes('authMechanism=MONGODB-AWS'), awsSdk: process.env.MONGODB_AWS_SDK, azure: MONGODB_URI.includes('ENVIRONMENT:azure'), - adl: this.configuration.buildInfo.dataLake - ? this.configuration.buildInfo.dataLake.version - : false, kerberos: process.env.PRINCIPAL != null, ldap: MONGODB_URI.includes('authMechanism=PLAIN'), socks5: MONGODB_URI.includes('proxyHost='),