upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #60935 from nextcloud/backport/60881/stable33
Some checks failed
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Integration sqlite / changes (push) Waiting to run
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, --tags ~@large files_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, capabilities_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, collaboration_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, comments_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, dav_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, federation_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, file_conversions) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, files_reminders) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, filesdrop_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, ldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, openldap_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, openldap_numerical_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, remoteapi_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, routing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, setup_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, sharees_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, sharing_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, theming_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite (stable33, 8.4, stable33, videoverification_features) (push) Blocked by required conditions
Details
Integration sqlite / integration-sqlite-summary (push) Blocked by required conditions
Details
Psalm static code analysis / static-code-analysis (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-security (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-ocp (push) Has been cancelled
Details
Psalm static code analysis / static-code-analysis-ncu (push) Has been cancelled
Details

Browse source 
[stable33] test(cache): avoid ordering assumptions in testExtended
This commit is contained in:
Josh 2026-06-03 12:14:26 -04:00 committed by GitHub
commit 66c608eb1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/lib/Files/Cache/CacheTest.php
View file

@ -798,26 +798,31 @@ class CacheTest extends \Test\TestCase {
$entries = $this->cache->getFolderContents('');
$this->assertCount(4, $entries);
$this->assertEquals('foo1', $entries[0]->getName());
$this->assertEquals('foo2', $entries[1]->getName());
$this->assertEquals('foo3', $entries[2]->getName());
$this->assertEquals('foo4', $entries[3]->getName());
$entriesByName = [];
foreach ($entries as $entry) {
$entriesByName[$entry->getName()] = $entry;
}
$this->assertEquals(20, $entries[0]->getCreationTime());
$this->assertEquals(0, $entries[0]->getUploadTime());
$this->assertEquals(null, $entries[0]->getMetadataEtag());
$this->assertArrayHasKey('foo1', $entriesByName);
$this->assertArrayHasKey('foo2', $entriesByName);
$this->assertArrayHasKey('foo3', $entriesByName);
$this->assertArrayHasKey('foo4', $entriesByName);
$this->assertEquals(0, $entries[1]->getCreationTime());
$this->assertEquals(30, $entries[1]->getUploadTime());
$this->assertEquals(null, $entries[1]->getMetadataEtag());
$this->assertEquals(20, $entriesByName['foo1']->getCreationTime());
$this->assertEquals(0, $entriesByName['foo1']->getUploadTime());
$this->assertEquals(null, $entriesByName['foo1']->getMetadataEtag());
$this->assertEquals(0, $entries[2]->getCreationTime());
$this->assertEquals(0, $entries[2]->getUploadTime());
$this->assertEquals('foo', $entries[2]->getMetadataEtag());
$this->assertEquals(0, $entriesByName['foo2']->getCreationTime());
$this->assertEquals(30, $entriesByName['foo2']->getUploadTime());
$this->assertEquals(null, $entriesByName['foo2']->getMetadataEtag());
$this->assertEquals(0, $entries[3]->getCreationTime());
$this->assertEquals(0, $entries[3]->getUploadTime());
$this->assertEquals(null, $entries[3]->getMetadataEtag());
$this->assertEquals(0, $entriesByName['foo3']->getCreationTime());
$this->assertEquals(0, $entriesByName['foo3']->getUploadTime());
$this->assertEquals('foo', $entriesByName['foo3']->getMetadataEtag());
$this->assertEquals(0, $entriesByName['foo4']->getCreationTime());
$this->assertEquals(0, $entriesByName['foo4']->getUploadTime());
$this->assertEquals(null, $entriesByName['foo4']->getMetadataEtag());
$this->cache->update($id1, ['upload_time' => 25]);
@ -833,6 +838,7 @@ class CacheTest extends \Test\TestCase {
$entries = $this->cache->getFolderContents('sub');
$this->assertCount(1, $entries);
$this->assertEquals('foo1', $entries[0]->getName());
$this->assertEquals(20, $entries[0]->getCreationTime());
$this->assertEquals(25, $entries[0]->getUploadTime());
$this->assertEquals(null, $entries[0]->getMetadataEtag());