diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 2b5b903f..865557d6 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -44,11 +44,11 @@ services: - NODES=6 - REPLICAS=1 - TLS_ENABLED=yes - - PORT=16379 + - PORT=6372 - TLS_PORT=27379 command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""} ports: - - "6372-6377:16379-16384" + - "6372-6377:6372-6377" volumes: - "./dockers/cluster:/redis/work" profiles: diff --git a/CHANGELOG.md b/CHANGELOG.md index 34aed5a6..b3508f95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,9 @@ ### Fixed - Fixed single persistent connection using the same resource (#1512) +### Maintenance +- Revisit incompatible tests against Relay (#1537) + ## v2.4.0 (2025-04-30) ### Added - Added new hash-field expiration commands (#1520) diff --git a/tests/PHPUnit/PredisConnectionTestCase.php b/tests/PHPUnit/PredisConnectionTestCase.php index a3a4ad2b..bf931bca 100644 --- a/tests/PHPUnit/PredisConnectionTestCase.php +++ b/tests/PHPUnit/PredisConnectionTestCase.php @@ -156,7 +156,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testDisconnectForcesDisconnection(): void { @@ -183,7 +182,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testGetResourceForcesConnection(): void { @@ -265,7 +263,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testWritesCommandToServer(): void { @@ -287,7 +284,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsCommandFromServer(): void { @@ -310,7 +306,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testIsAbleToWriteMultipleCommandsAndReadThemBackForPipelining(): void { @@ -377,7 +372,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsStatusResponses(): void { @@ -398,7 +392,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsBulkResponses(): void { @@ -416,7 +409,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsIntegerResponses(): void { @@ -431,7 +423,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsErrorResponsesAsResponseErrorObjects(): void { @@ -449,7 +440,6 @@ abstract class PredisConnectionTestCase extends PredisTestCase /** * @group connected - * @group relay-incompatible */ public function testReadsMultibulkResponsesAsArrays(): void { diff --git a/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php index f17b0eec..ddb6118a 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php @@ -90,7 +90,6 @@ class BFADD_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void diff --git a/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php b/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php index f20a2a2c..b7f96f48 100644 --- a/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php +++ b/tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php @@ -90,7 +90,6 @@ class BFMADD_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php index 76973a87..1cdaa098 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php @@ -104,7 +104,6 @@ class CFRESERVE_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void diff --git a/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php b/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php index f947a239..fa8a0989 100644 --- a/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php +++ b/tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php @@ -96,7 +96,6 @@ class CFSCANDUMP_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @requiresRedisBfVersion >= 1.0.0 */ public function testThrowsExceptionOnWrongType(): void diff --git a/tests/Predis/Command/Redis/PSUBSCRIBE_Test.php b/tests/Predis/Command/Redis/PSUBSCRIBE_Test.php index 59b8ebe0..623c9c1f 100644 --- a/tests/Predis/Command/Redis/PSUBSCRIBE_Test.php +++ b/tests/Predis/Command/Redis/PSUBSCRIBE_Test.php @@ -18,7 +18,6 @@ use Predis\Consumer\Push\PushResponse; /** * @group commands * @group realm-pubsub - * @group relay-incompatible */ class PSUBSCRIBE_Test extends PredisCommandTestCase { @@ -40,6 +39,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group disconnected + * @group relay-incompatible */ public function testFilterArguments(): void { @@ -98,6 +98,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testReturnsTheFirstPsubscribedChannelDetails(): void @@ -109,6 +110,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 6.0.0 */ public function testReturnsTheFirstPsubscribedChannelDetailsResp3(): void @@ -121,6 +123,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendPsubscribeAfterPsubscribe(): void @@ -133,6 +136,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendSubscribeAfterPsubscribe(): void @@ -145,6 +149,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendUnsubscribeAfterPsubscribe(): void @@ -158,6 +163,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendPunsubscribeAfterPsubscribe(): void @@ -171,6 +177,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendQuitAfterPsubscribe(): void @@ -184,6 +191,7 @@ class PSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCannotSendOtherCommandsAfterPsubscribe(): void diff --git a/tests/Predis/Command/Redis/PUNSUBSCRIBE_Test.php b/tests/Predis/Command/Redis/PUNSUBSCRIBE_Test.php index 81fdcbd7..f1369280 100644 --- a/tests/Predis/Command/Redis/PUNSUBSCRIBE_Test.php +++ b/tests/Predis/Command/Redis/PUNSUBSCRIBE_Test.php @@ -18,7 +18,6 @@ use Predis\Consumer\Push\PushResponse; /** * @group commands * @group realm-pubsub - * @group relay-incompatible */ class PUNSUBSCRIBE_Test extends PredisCommandTestCase { @@ -98,6 +97,7 @@ class PUNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testDoesNotSwitchToSubscribeMode(): void @@ -110,6 +110,7 @@ class PUNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 6.0.0 */ public function testDoesNotSwitchToSubscribeModeResp3(): void @@ -123,6 +124,7 @@ class PUNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testUnsubscribesFromNotSubscribedChannels(): void @@ -134,6 +136,7 @@ class PUNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testUnsubscribesFromSubscribedChannels(): void @@ -147,6 +150,7 @@ class PUNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.6.0 */ public function testUnsubscribesFromAllSubscribedChannels(): void diff --git a/tests/Predis/Command/Redis/SUBSCRIBE_Test.php b/tests/Predis/Command/Redis/SUBSCRIBE_Test.php index 96bc8f0c..8421cd97 100644 --- a/tests/Predis/Command/Redis/SUBSCRIBE_Test.php +++ b/tests/Predis/Command/Redis/SUBSCRIBE_Test.php @@ -18,7 +18,6 @@ use Predis\Consumer\Push\PushResponse; /** * @group commands * @group realm-pubsub - * @group relay-incompatible */ class SUBSCRIBE_Test extends PredisCommandTestCase { @@ -98,6 +97,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testReturnsTheFirstSubscribedChannelDetails(): void @@ -109,6 +109,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 6.0.0 */ public function testReturnsTheFirstSubscribedChannelDetailsResp3(): void @@ -121,6 +122,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendSubscribeAfterSubscribe(): void @@ -133,6 +135,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendPsubscribeAfterSubscribe(): void @@ -145,6 +148,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendUnsubscribeAfterSubscribe(): void @@ -158,6 +162,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendPunsubscribeAfterSubscribe(): void @@ -171,6 +176,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCanSendQuitAfterSubscribe(): void @@ -184,6 +190,7 @@ class SUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testCannotSendOtherCommandsAfterSubscribe(): void diff --git a/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php b/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php index 505d45da..72264254 100644 --- a/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSUGGET_Test.php @@ -84,7 +84,6 @@ class FTSUGGET_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRediSearchVersion >= 1.0.0 */ @@ -119,7 +118,6 @@ class FTSUGGET_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRediSearchVersion >= 1.0.0 */ diff --git a/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php b/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php index 48290af0..8b2a97d8 100644 --- a/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php +++ b/tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php @@ -109,7 +109,6 @@ class FTSYNDUMP_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRediSearchVersion >= 1.2.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php b/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php index 29accd4e..41efc8a3 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKLIST_Test.php @@ -107,7 +107,6 @@ class TOPKLIST_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php b/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php index 362d22d7..7acfc788 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKQUERY_Test.php @@ -92,7 +92,6 @@ class TOPKQUERY_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php b/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php index 7aba6ff3..fe224b69 100644 --- a/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php +++ b/tests/Predis/Command/Redis/TopK/TOPKRESERVE_Test.php @@ -104,7 +104,6 @@ class TOPKRESERVE_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRedisBfVersion >= 2.0.0 */ diff --git a/tests/Predis/Command/Redis/UNSUBSCRIBE_Test.php b/tests/Predis/Command/Redis/UNSUBSCRIBE_Test.php index ac2eaa28..cc27bbca 100644 --- a/tests/Predis/Command/Redis/UNSUBSCRIBE_Test.php +++ b/tests/Predis/Command/Redis/UNSUBSCRIBE_Test.php @@ -18,7 +18,6 @@ use Predis\Consumer\Push\PushResponse; /** * @group commands * @group realm-pubsub - * @group relay-incompatible */ class UNSUBSCRIBE_Test extends PredisCommandTestCase { @@ -98,6 +97,7 @@ class UNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testDoesNotSwitchToSubscribeMode(): void @@ -110,6 +110,7 @@ class UNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 6.0.0 */ public function testDoesNotSwitchToSubscribeModeResp3(): void @@ -123,6 +124,7 @@ class UNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testUnsubscribesFromNotSubscribedChannels(): void @@ -134,6 +136,7 @@ class UNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testUnsubscribesFromSubscribedChannels(): void @@ -146,6 +149,7 @@ class UNSUBSCRIBE_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.0.0 */ public function testUnsubscribesFromAllSubscribedChannels(): void diff --git a/tests/Predis/Command/Redis/WATCH_Test.php b/tests/Predis/Command/Redis/WATCH_Test.php index d3dbe042..1a1250ae 100644 --- a/tests/Predis/Command/Redis/WATCH_Test.php +++ b/tests/Predis/Command/Redis/WATCH_Test.php @@ -17,7 +17,6 @@ use Predis\Command\PrefixableCommand; /** * @group commands * @group realm-transaction - * @group relay-incompatible */ class WATCH_Test extends PredisCommandTestCase { @@ -92,6 +91,7 @@ class WATCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.2.0 */ public function testAbortsTransactionOnExternalWriteOperations(): void @@ -111,6 +111,7 @@ class WATCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 6.0.0 */ public function testAbortsTransactionOnExternalWriteOperationsResp3(): void @@ -130,6 +131,7 @@ class WATCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.2.0 */ public function testWatchMultipleKeysAsListAbortsTransactionOnExternalWriteOperations(): void @@ -149,6 +151,7 @@ class WATCH_Test extends PredisCommandTestCase /** * @group connected + * @group relay-incompatible * @requiresRedisVersion >= 2.2.0 */ public function testCanWatchNotYetExistingKeys(): void @@ -171,7 +174,7 @@ class WATCH_Test extends PredisCommandTestCase public function testThrowsExceptionWhenCallingInsideTransaction(): void { $this->expectException('Predis\Response\ServerException'); - $this->expectExceptionMessage('ERR WATCH inside MULTI is not allowed'); + $this->expectExceptionMessage('WATCH inside MULTI is not allowed'); $redis = $this->getClient(); diff --git a/tests/Predis/Command/Redis/XAUTOCLAIM_Test.php b/tests/Predis/Command/Redis/XAUTOCLAIM_Test.php index 99d18af3..fea6d01c 100644 --- a/tests/Predis/Command/Redis/XAUTOCLAIM_Test.php +++ b/tests/Predis/Command/Redis/XAUTOCLAIM_Test.php @@ -54,7 +54,6 @@ class XAUTOCLAIM_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRedisVersion >= 7.0.0 */ diff --git a/tests/Predis/Command/Redis/XREAD_Test.php b/tests/Predis/Command/Redis/XREAD_Test.php index 27f6e9e4..13df0a9f 100644 --- a/tests/Predis/Command/Redis/XREAD_Test.php +++ b/tests/Predis/Command/Redis/XREAD_Test.php @@ -83,7 +83,6 @@ class XREAD_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible * @return void * @requiresRedisVersion >= 6.2.0 */ diff --git a/tests/Predis/Command/Redis/ZREVRANGE_Test.php b/tests/Predis/Command/Redis/ZREVRANGE_Test.php index 850e7b9d..57bfe897 100644 --- a/tests/Predis/Command/Redis/ZREVRANGE_Test.php +++ b/tests/Predis/Command/Redis/ZREVRANGE_Test.php @@ -127,7 +127,6 @@ class ZREVRANGE_Test extends PredisCommandTestCase /** * @group connected - * @group relay-incompatible */ public function testReturnsElementsInRange(): void { @@ -150,7 +149,6 @@ class ZREVRANGE_Test extends PredisCommandTestCase /** * @group connected * @requiresRedisVersion >= 6.0.0 - * @group relay-incompatible */ public function testReturnsElementsInRangeResp3(): void {