From 8117ab9542425da5b9ee913b8f1378065a6f66d2 Mon Sep 17 00:00:00 2001 From: Prem Palanisamy Date: Mon, 2 Feb 2026 19:07:50 +0000 Subject: [PATCH] simplify CacheTest to match other Health tests --- tests/e2e/Services/Health/CacheTest.php | 96 ------------------------- 1 file changed, 96 deletions(-) diff --git a/tests/e2e/Services/Health/CacheTest.php b/tests/e2e/Services/Health/CacheTest.php index 3ba63f4d22..0b825b2dba 100644 --- a/tests/e2e/Services/Health/CacheTest.php +++ b/tests/e2e/Services/Health/CacheTest.php @@ -2,25 +2,8 @@ namespace Tests\E2E\Services\Health; -use Redis; -use Utopia\Cache\Adapter\Redis as RedisAdapter; -use Utopia\Cache\Cache; -use Utopia\System\System; - class CacheTest extends HealthBase { - private static string $redisHost; - private static int $redisPort; - private static string $redisContainer; - - public static function setUpBeforeClass(): void - { - parent::setUpBeforeClass(); - self::$redisHost = System::getEnv('_APP_REDIS_HOST', 'redis'); - self::$redisPort = (int) System::getEnv('_APP_REDIS_PORT', '6379'); - self::$redisContainer = System::getEnv('_APP_REDIS_CONTAINER', 'appwrite-redis'); - } - public function testCacheSuccess(): void { $response = $this->callGet('/health/cache'); @@ -30,83 +13,4 @@ class CacheTest extends HealthBase $this->assertLessThan(100, $response['body']['statuses'][0]['ping']); $this->assertEquals('pass', $response['body']['statuses'][0]['status']); } - - public function testCacheReconnect(): void - { - $redis = new Redis(); - $redis->connect(self::$redisHost, self::$redisPort); - $cache = new Cache( - (new RedisAdapter($redis)) - ->setMaxRetries(CACHE_RECONNECT_MAX_RETRIES) - ->setRetryDelay(CACHE_RECONNECT_RETRY_DELAY) - ); - - $cache->save('test:reconnect', 'reconnect', 'test:reconnect'); - - $container = self::$redisContainer; - $stopCmd = "docker ps -a --filter \"name={$container}\" --format \"{{.Names}}\" | xargs -r docker stop"; - exec($stopCmd . ' 2>&1', $output, $exitCode); - $this->assertEquals(0, $exitCode, "Docker stop failed: $stopCmd\nOutput: " . implode("\n", $output)); - sleep(1); - - try { - try { - $cache->load('test:reconnect', 5); - $this->fail('Redis connection should have failed'); - } catch (\RedisException $e) { - } - } finally { - $output = []; - $startCmd = "docker ps -a --filter \"name={$container}\" --format \"{{.Names}}\" | xargs -r docker start"; - exec($startCmd . ' 2>&1', $output, $exitCode); - $this->assertEquals(0, $exitCode, "Docker start failed: $startCmd\nOutput: " . implode("\n", $output)); - } - - $this->assertEventually(function () use ($cache) { - $this->assertEquals('reconnect', $cache->save('test:reconnect', 'reconnect', 'test:reconnect')); - $this->assertEquals('reconnect', $cache->load('test:reconnect', 5)); - return true; - }, 10000, 1000); - } - - /** - * @depends testCacheReconnect - */ - public function testCacheReconnectPersistent(): void - { - $redis = new Redis(); - $redis->pconnect(self::$redisHost, self::$redisPort); - $cache = new Cache( - (new RedisAdapter($redis)) - ->setMaxRetries(CACHE_RECONNECT_MAX_RETRIES) - ->setRetryDelay(CACHE_RECONNECT_RETRY_DELAY) - ); - - $cache->save('test:reconnect_persistent', 'reconnect_persistent', 'test:reconnect_persistent'); - - $container = self::$redisContainer; - $stopCmd = "docker ps -a --filter \"name={$container}\" --format \"{{.Names}}\" | xargs -r docker stop"; - exec($stopCmd . ' 2>&1', $output, $exitCode); - $this->assertEquals(0, $exitCode, "Docker stop failed: $stopCmd\nOutput: " . implode("\n", $output)); - sleep(1); - - try { - try { - $cache->load('test:reconnect_persistent', 5); - $this->fail('Redis connection should have failed'); - } catch (\RedisException $e) { - } - } finally { - $output = []; - $startCmd = "docker ps -a --filter \"name={$container}\" --format \"{{.Names}}\" | xargs -r docker start"; - exec($startCmd . ' 2>&1', $output, $exitCode); - $this->assertEquals(0, $exitCode, "Docker start failed: $startCmd\nOutput: " . implode("\n", $output)); - } - - $this->assertEventually(function () use ($cache) { - $this->assertEquals('reconnect_persistent', $cache->save('test:reconnect_persistent', 'reconnect_persistent', 'test:reconnect_persistent')); - $this->assertEquals('reconnect_persistent', $cache->load('test:reconnect_persistent', 5)); - return true; - }, 10000, 1000); - } }