Skip to content

test(s3): fix flaky EOF check and remove PHP 8.5 skip #61275

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
nickvergessen merged 2 commits into from
Jun 15, 2026
+15 −14
Merged

test(s3): fix flaky EOF check and remove PHP 8.5 skip #61275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4924b
test(s3): make testFileSizes EOF assertion more robust
joshtrichards Jun 13, 2026
384e21b
test(s3): drop unnecessarily added fclose
joshtrichards Jun 13, 2026
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
29 changes: 15 additions & 14 deletions tests/lib/Files/ObjectStore/S3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,20 @@ public static function dataFileSizes(): array {

#[\PHPUnit\Framework\Attributes\DataProvider('dataFileSizes')]
public function testFileSizes($size): void {
if (str_starts_with(PHP_VERSION, '8.5') && getenv('CI')) {
$this->markTestSkipped('Test is unreliable and skipped on 8.5');
}

$this->cleanupAfter('testfilesizes');
$s3 = $this->getInstance();

$sourceStream = fopen('php://memory', 'wb+');
$writeChunkSize = 1024;
$chunkCount = $size / $writeChunkSize;
for ($i = 0; $i < $chunkCount; $i++) {
fwrite($sourceStream, str_repeat('A',
($i < $chunkCount - 1) ? $writeChunkSize : $size - ($i * $writeChunkSize)
));
$chunk = str_repeat('A', $writeChunkSize);
$remainingSize = $size;

while ($remainingSize > 0) {
$bytesToWrite = min($writeChunkSize, $remainingSize);
fwrite($sourceStream, ($bytesToWrite === $writeChunkSize) ? $chunk : str_repeat('A', $bytesToWrite));
$remainingSize -= $bytesToWrite;
}

rewind($sourceStream);
$s3->writeObject('testfilesizes', $sourceStream);

Expand All @@ -174,15 +173,17 @@ public function testFileSizes($size): void {
$result = $s3->readObject('testfilesizes');

// compare first 100 bytes
self::assertEquals(str_repeat('A', 100), fread($result, 100), 'Compare first 100 bytes');
self::assertSame(str_repeat('A', 100), fread($result, 100), 'Compare first 100 bytes');

// compare last 100 bytes
fseek($result, $size - 100);
self::assertEquals(str_repeat('A', 100), fread($result, 100), 'Compare last 100 bytes');
self::assertSame(0, fseek($result, $size - 100), 'Seek to last 100 bytes succeeds');
self::assertSame(str_repeat('A', 100), fread($result, 100), 'Compare last 100 bytes');

// end of file reached
fseek($result, $size);
self::assertTrue(feof($result), 'End of file reached');
self::assertSame(0, fseek($result, $size), 'Seek to EOF succeeds');
self::assertSame($size, ftell($result), 'Pointer is at the end of file');
self::assertSame('', fread($result, 1), 'Reading at end of file returns no bytes');
self::assertTrue(feof($result), 'End of file reached after read attempt');

$this->assertNoUpload('testfilesizes');
}
Expand Down
Loading