Skip to content

Fix evergreen failures #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Fix evergreen failures #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef77a0
Use static::createTestClient() to fix API versioning tests
alcaeus Nov 27, 2023
86314be
Change task names to allow testing API version tasks
alcaeus Nov 27, 2023
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
4 changes: 2 additions & 2 deletions .evergreen/config/generated/test/require-api-version-5.0.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .evergreen/config/generated/test/require-api-version-6.0.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .evergreen/config/generated/test/require-api-version-7.0.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .evergreen/config/generated/test/require-api-version-latest.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .evergreen/config/generated/test/require-api-version-rapid.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .evergreen/config/templates/test/require-api-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- name: "test-requireApiVersion-%mongodbVersion%"
- name: "test-mongodb-%mongodbVersion%-requireApiVersion"
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
commands:
- func: "bootstrap mongo-orchestration"
Expand All @@ -14,7 +14,7 @@ tasks:
vars:
API_VERSION: "1"

- name: "test-acceptApiVersion2-%mongodbVersion%"
- name: "test-mongodb-%mongodbVersion%-acceptApiVersion2"
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
commands:
- func: "bootstrap mongo-orchestration"
Expand Down
2 changes: 1 addition & 1 deletion tests/ClientFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public function testStartSession(): void

public function testAddAndRemoveSubscriber(): void
{
$client = new Client(static::getUri());
$client = static::createTestClient();

$addedSubscriber = $this->createMock(CommandSubscriber::class);
$addedSubscriber->expects($this->once())->method('commandStarted');
Expand Down
12 changes: 10 additions & 2 deletions tests/GridFS/BucketFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,8 @@ public function testDanglingOpenWritableStream(): void

$code = <<<'PHP'
require '%s';
$client = new \MongoDB\Client(getenv('MONGODB_URI') ?: 'mongodb://127.0.0.1:27017/?serverSelectionTimeoutMS=100');
require '%s';
$client = MongoDB\Tests\FunctionalTestCase::createTestClient();
$database = $client->selectDatabase(getenv('MONGODB_DATABASE') ?: 'phplib_test');
$gridfs = $database->selectGridFSBucket();
$stream = $gridfs->openUploadStream('hello.txt', ['disableMD5' => true]);
Expand All @@ -867,7 +868,14 @@ public function testDanglingOpenWritableStream(): void
implode(' ', [
PHP_BINARY,
'-r',
escapeshellarg(sprintf($code, __DIR__ . '/../../vendor/autoload.php')),
escapeshellarg(
sprintf(
$code,
__DIR__ . '/../../vendor/autoload.php',
// Include the PHPUnit autoload file to ensure PHPUnit classes can be loaded
__DIR__ . '/../../vendor/bin/.phpunit/phpunit/vendor/autoload.php',
),
),
'2>&1',
]),
$output,
Expand Down