Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .evergreen/config/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,6 @@ functions:
TESTS=${TESTS} \
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh

"run atlas data lake test":
- command: shell.exec
type: test
params:
working_dir: "src"
script: |
${PREPARE_SHELL}
export PATH="${PHP_PATH}/bin:$PATH"

MONGODB_URI="mongodb://mhuser:pencil@127.0.0.1:27017" \
TESTS="atlas-data-lake" \
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh

"cleanup":
- command: shell.exec
params:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .evergreen/config/generated/test-variant/phpc.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
- ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".sharded .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- "test-atlas-data-lake"

# Test MongoDB 5.0 and 6.0
- name: test-debian11-php-%phpVersion%-local
Expand Down
1 change: 0 additions & 1 deletion .evergreen/config/templates/test-variant/phpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@
- ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".sharded .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
- "test-atlas-data-lake"
8 changes: 0 additions & 8 deletions .evergreen/config/test-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ tasks:
vars:
TESTS: "atlas"

- name: "test-atlas-data-lake"
commands:
- command: ec2.assume_role
params:
role_arn: ${aws_test_secrets_role}
- func: "bootstrap mongohoused"
- func: "run atlas data lake test"

- name: "run-benchmark"
exec_timeout_secs: 3600
commands:
Expand Down
15 changes: 0 additions & 15 deletions .evergreen/config/test-variants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,3 @@ buildvariants:
name: "build-php-8.2"
tasks:
- "run-benchmark"

# Run Atlas Data Lake Tests on Ubuntu
- name: test-ubuntu2204-php82-local
tags: ["test", "ubuntu", "x64"]
display_name: "Test: Ubuntu 22.04 x64, PHP 8.2"
run_on: ubuntu2204-small
expansions:
FETCH_BUILD_VARIANT: "build-ubuntu2204"
FETCH_BUILD_TASK: "build-php-8.2"
PHP_VERSION: "8.2"
depends_on:
- variant: "build-ubuntu2204"
name: "build-php-8.2"
tasks:
- "test-atlas-data-lake"
4 changes: 0 additions & 4 deletions .evergreen/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ case "$TESTS" in
php vendor/bin/phpunit $PHPUNIT_OPTS --group atlas
;;

atlas-data-lake)
php vendor/bin/phpunit $PHPUNIT_OPTS --group atlas-data-lake
;;

csfle)
php vendor/bin/phpunit $PHPUNIT_OPTS --group csfle
;;
Expand Down
10 changes: 0 additions & 10 deletions tests/FunctionalTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,16 +519,6 @@ protected function skipIfTransactionsAreNotSupported(): void
}
}

protected function isAtlasDataLake(): bool
{
$buildInfo = $this->getPrimaryServer()->executeCommand(
$this->getDatabaseName(),
new Command(['buildInfo' => 1]),
)->toArray()[0];

return ! empty($buildInfo->dataLake);
}

protected function isEnterprise(): bool
{
$buildInfo = $this->getPrimaryServer()->executeCommand(
Expand Down
140 changes: 0 additions & 140 deletions tests/SpecTests/AtlasDataLakeSpecTest.php

This file was deleted.

16 changes: 0 additions & 16 deletions tests/UnifiedSpecTests/UnifiedSpecTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,6 @@ public function setUp(): void
}
}

#[DataProvider('provideAtlasDataLakeTests')]
#[Group('atlas-data-lake')]
public function testAtlasDataLake(UnifiedTestCase $test): void
{
if (! $this->isAtlasDataLake()) {
$this->markTestSkipped('Server is not Atlas Data Lake');
}

self::$runner->run($test);
}

public static function provideAtlasDataLakeTests(): Generator
{
return self::provideTests('atlas-data-lake-testing/tests/unified', 'atlas-data-lake');
}

#[DataProvider('provideChangeStreamsTests')]
public function testChangeStreams(UnifiedTestCase $test): void
{
Expand Down