Skip to content

Commit 97e4e4b

Browse files
authored
Fix evergreen failures (#1200)
* Use static::createTestClient() to fix API versioning tests * Change task names to allow testing API version tasks
1 parent 33feb71 commit 97e4e4b

8 files changed

+23
-15
lines changed

.evergreen/config/generated/test/require-api-version-5.0.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-6.0.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-7.0.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-latest.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-rapid.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/templates/test/require-api-version.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tasks:
2-
- name: "test-requireApiVersion-%mongodbVersion%"
2+
- name: "test-mongodb-%mongodbVersion%-requireApiVersion"
33
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
44
commands:
55
- func: "bootstrap mongo-orchestration"
@@ -14,7 +14,7 @@ tasks:
1414
vars:
1515
API_VERSION: "1"
1616

17-
- name: "test-acceptApiVersion2-%mongodbVersion%"
17+
- name: "test-mongodb-%mongodbVersion%-acceptApiVersion2"
1818
tags: ["standalone", "local", "%mongodbVersion%", "versioned_api"]
1919
commands:
2020
- func: "bootstrap mongo-orchestration"

tests/ClientFunctionalTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function testStartSession(): void
124124

125125
public function testAddAndRemoveSubscriber(): void
126126
{
127-
$client = new Client(static::getUri());
127+
$client = static::createTestClient();
128128

129129
$addedSubscriber = $this->createMock(CommandSubscriber::class);
130130
$addedSubscriber->expects($this->once())->method('commandStarted');

tests/GridFS/BucketFunctionalTest.php

+10-2
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,8 @@ public function testDanglingOpenWritableStream(): void
856856

857857
$code = <<<'PHP'
858858
require '%s';
859-
$client = new \MongoDB\Client(getenv('MONGODB_URI') ?: 'mongodb://127.0.0.1:27017/?serverSelectionTimeoutMS=100');
859+
require '%s';
860+
$client = MongoDB\Tests\FunctionalTestCase::createTestClient();
860861
$database = $client->selectDatabase(getenv('MONGODB_DATABASE') ?: 'phplib_test');
861862
$gridfs = $database->selectGridFSBucket();
862863
$stream = $gridfs->openUploadStream('hello.txt', ['disableMD5' => true]);
@@ -867,7 +868,14 @@ public function testDanglingOpenWritableStream(): void
867868
implode(' ', [
868869
PHP_BINARY,
869870
'-r',
870-
escapeshellarg(sprintf($code, __DIR__ . '/../../vendor/autoload.php')),
871+
escapeshellarg(
872+
sprintf(
873+
$code,
874+
__DIR__ . '/../../vendor/autoload.php',
875+
// Include the PHPUnit autoload file to ensure PHPUnit classes can be loaded
876+
__DIR__ . '/../../vendor/bin/.phpunit/phpunit/vendor/autoload.php',
877+
),
878+
),
871879
'2>&1',
872880
]),
873881
$output,

0 commit comments

Comments
 (0)