Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix tests on ChillDocumentLockManager: take expiration delay into account

Browse Source
This commit is contained in:
Julien Fastré 2023-08-28 13:00:53 +02:00
parent c33330969c
commit 398bbd12d5
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
View File

@ -26,8 +26,10 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
*/ */
private const LOCK_GRACEFUL_DURATION_TIME = 3; private const LOCK_GRACEFUL_DURATION_TIME = 3;
public function __construct(private readonly ChillRedis $redis) public function __construct(
{ private readonly ChillRedis $redis,
private int $ttlAfterDeleteSeconds = self::LOCK_GRACEFUL_DURATION_TIME
) {
} }
public function deleteLock(Document $document, RequestInterface $request): bool public function deleteLock(Document $document, RequestInterface $request): bool
@ -38,7 +40,7 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
// some queries (ex.: putFile) may be executed on the same time than the unlock, so // some queries (ex.: putFile) may be executed on the same time than the unlock, so
// we add a delay before unlocking the file, instead of deleting it immediatly // we add a delay before unlocking the file, instead of deleting it immediatly
return $this->redis->expire($this->getCacheId($document), self::LOCK_GRACEFUL_DURATION_TIME); return $this->redis->expire($this->getCacheId($document), $this->ttlAfterDeleteSeconds);
} }
public function getLock(Document $document, RequestInterface $request): string public function getLock(Document $document, RequestInterface $request): string

27
src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
View File

@ -31,27 +31,6 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
self::bootKernel(); self::bootKernel();
} }
public function testMultipleLoops()
{
$manager = $this->makeManager(1);
$document = new StoredObject();
$request = $this->prophesize(RequestInterface::class);
$i = 0;
while (50 > ++$i) {
$this->assertFalse($manager->hasLock($document, $request->reveal()));
$this->assertTrue($manager->setLock($document, 'dummy', $request->reveal()));
$this->assertEquals('dummy', $manager->getLock($document, $request->reveal()));
$this->assertTrue($manager->deleteLock($document, $request->reveal()));
$this->assertFalse($manager->hasLock($document, $request->reveal()));
}
}
public function testRelock() public function testRelock()
{ {
$manager = $this->makeManager(1); $manager = $this->makeManager(1);
@ -70,6 +49,8 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
$this->assertTrue($manager->deleteLock($document, $request->reveal())); $this->assertTrue($manager->deleteLock($document, $request->reveal()));
sleep(3); // wait for redis to remove the key
$this->assertFalse($manager->hasLock($document, $request->reveal())); $this->assertFalse($manager->hasLock($document, $request->reveal()));
} }
@ -87,10 +68,12 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
$this->assertTrue($manager->deleteLock($document, $request->reveal())); $this->assertTrue($manager->deleteLock($document, $request->reveal()));
sleep(3); // wait for redis to remove the key
$this->assertFalse($manager->hasLock($document, $request->reveal())); $this->assertFalse($manager->hasLock($document, $request->reveal()));
} }
private function makeManager(int $ttlAfterDeleteSeconds): ChillDocumentLockManager private function makeManager(int $ttlAfterDeleteSeconds = -1): ChillDocumentLockManager
{ {
$redis = self::$container->get(ChillRedis::class); $redis = self::$container->get(ChillRedis::class);