8000 Update tests against Relay (#1537) · predis/predis@9b1c6d2 · GitHub
[go: up one dir, main page]
10000 Skip to content

Commit 9b1c6d2

Browse files
yatsukhnenkoyatsukhnenko
authored
Update tests against Relay (#1537)
1 parent 3cc3547 commit 9b1c6d2

20 files changed

+37
-32
lines changed

‎.github/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ services:
4444
- NODES=6
4545
- REPLICAS=1
4646
- TLS_ENABLED=yes
47-
- PORT=16379
47+
- PORT=6372
4848
- TLS_PORT=27379
4949
command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
5050
ports:
51-
- "6372-6377:16379-16384"
51+
- "6372-6377:6372-6377"
5252
volumes:
5353
- "./dockers/cluster:/redis/work"
5454
profiles:

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
### Fixed
2929
- Fixed single persistent connection using the same resource (#1512)
3030

31+
### Maintenance
32+
- Revisit incompatible tests against Relay (#1537)
33+
3134
## v2.4.0 (2025-04-30)
3235
### Added
3336
- Added new hash-field expiration commands (#1520)

‎tests/PHPUnit/PredisConnectionTestCase.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public function testDoesNotThrowExceptionOnConnectWhenAlreadyConnected(): void
156156

157157
/**
158158
* @group connected
159-
* @group relay-incompatible
160159
*/
161160
public function testDisconnectForcesDisconnection(): void
162161
{
@@ -183,7 +182,6 @@ public function testDoesNotThrowExceptionOnDisconnectWhenAlreadyDisconnected():
183182

184183
/**
185184
* @group connected
186-
* @group relay-incompatible
187185
*/
188186
public function testGetResourceForcesConnection(): void
189187
{
@@ -265,7 +263,6 @@ public function testExecutesMultipleCommandsOnServer(): void
265263

266264
/**
267265
* @group connected
268-
* @group relay-incompatible
269266
*/
270267
public function testWritesCommandToServer(): void
271268
{
@@ -287,7 +284,6 @@ public function testWritesCommandToServer(): void
287284

288285
/**
289286
* @group connected
290-
* @group relay-incompatible
291287
*/
292288
public function testReadsCommandFromServer(): void
293289
{
@@ -310,7 +306,6 @@ public function testReadsCommandFromServer(): void
310306

311307
/**
312308
* @group connected
313-
* @group relay-incompatible
314309
*/
315310
public function testIsAbleToWriteMultipleCommandsAndReadThemBackForPipelining(): void
316311
{
@@ -377,7 +372,6 @@ public function testSendsInitializationComman F438 dsOnConnection(): void
377372

378373
/**
379374
* @group connected
380-
* @group relay-incompatible
381375
*/
382376
public function testReadsStatusResponses(): void
383377
{
@@ -398,7 +392,6 @@ public function testReadsStatusResponses(): void
398392

399393
/**
400394
* @group connected
401-
* @group relay-incompatible
402395
*/
403396
public function testReadsBulkResponses(): void
404397
{
@@ -416,7 +409,6 @@ public function testReadsBulkResponses(): void
416409

417410
/**
418411
* @group connected
419-
* @group relay-incompatible
420412
*/
421413
public function testReadsIntegerResponses(): void
422414
{
@@ -431,7 +423,6 @@ public function testReadsIntegerResponses(): void
431423

432424
/**
433425
* @group connected
434-
* @group relay-incompatible
435426
*/
436427
public function testReadsErrorResponsesAsResponseErrorObjects(): void
437428
{
@@ -449,7 +440,6 @@ public function testReadsErrorResponsesAsResponseErrorObjects(): void
449440

450441
/**
451442
* @group connected
452-
* @group relay-incompatible
453443
*/
454444
public function testReadsMultibulkResponsesAsArrays(): void
455445
{

‎tests/Predis/Command/Redis/BloomFilter/BFADD_Test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public function testAddGivenItemIntoBloomFilterResp3(): void
9090

9191
/**
9292
* @group connected
93-
* @group relay-incompatible
9493
* @requiresRedisBfVersion >= 1.0.0
9594
*/
9695
public function testThrowsExceptionOnWrongType(): void

‎tests/Predis/Command/Redis/BloomFilter/BFMADD_Test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public function testAddGivenItemsIntoBloomFilterResp3(): void
9090

9191
/**
9292
* @group connected
93-
* @group relay-incompatible
9493
* @requiresRedisBfVersion >= 1.0.0
9594
*/
9695
public function testThrowsExceptionOnWrongType(): void

‎tests/Predis/Command/Redis/CuckooFilter/CFRESERVE_Test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public function testReserveCreatesCuckooFilterWithCorrectConfigurationResp3(): v
104104

105105
/**
106106
* @group connected
107-
* @group relay-incompatible
108107
* @requiresRedisBfVersion >= 1.0.0
109108
*/
110109
public function testThrowsExceptionOnWrongType(): void

‎tests/Predis/Command/Redis/CuckooFilter/CFSCANDUMP_Test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ public function testScanDumpReturnsNotEmptyDataChunkResp3(): void
9696

9797
/**
9898
* @group connected
99-
* @group relay-incompatible
10099
* @requiresRedisBfVersion >= 1.0.0
101100
*/
102101
public function testThrowsExceptionOnWrongType(): void

‎tests/Predis/Command/Redis/PSUBSCRIBE_Test.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/**
1919
* @group commands
2020
* @group realm-pubsub
21-
* @group relay-incompatible
2221
*/
2322
class PSUBSCRIBE_Test extends PredisCommandTestCase
2423
{
@@ -40,6 +39,7 @@ protected function getExpectedId(): string
4039

4140
/**
4241
* @group disconnected
42+
* @group relay-incompatible
4343
*/
4444
public function testFilterArguments(): void
4545
{
@@ -98,6 +98,7 @@ public function testPrefixKeys(): void
9898

9999
/**
100100
* @group connected
101+
* @group relay-incompatible
101102
* @requiresRedisVersion >= 2.0.0
102103
*/
103104
public function testReturnsTheFirstPsubscribedChannelDetails(): void
@@ -109,6 +110,7 @@ public function testReturnsTheFirstPsubscribedChannelDetails(): void
109110

110111
/**
111112
* @group connected
113+
* @group relay-incompatible
112114
* @requiresRedisVersion >= 6.0.0
113115
*/
114116
public function testReturnsTheFirstPsubscribedChannelDetailsResp3(): void
@@ -121,6 +123,7 @@ public function testReturnsTheFirstPsubscribedChannelDetailsResp3(): void
121123

122124
/**
123125
* @group connected
126+
* @group relay-incompatible
124127
* @requiresRedisVersion >= 2.0.0
125128
*/
126129
public function testCanSendPsubscribeAfterPsubscribe(): void
@@ -133,6 +136,7 @@ public function testCanSendPsubscribeAfterPsubscribe(): void
133136

134137
/**
135138
* @group connected
139+
* @group relay-incompatible
136140
* @requiresRedisVersion >= 2.0.0
137141
*/
138142
public function testCanSendSubscribeAfterPsubscribe(): void
@@ -145,6 +149,7 @@ public function testCanSendSubscribeAfterPsubscribe(): void
145149

146150
/**
147151
* @group connected
152+
* @group relay-incompatible
148153
* @requiresRedisVersion >= 2.0.0
149154
*/
150155
public function testCanSendUnsubscribeAfterPsubscribe(): void
@@ -158,6 +163,7 @@ public function testCanSendUnsubscribeAfterPsubscribe(): void
158163

159164
/**
160165
* @group connected
166+
* @group relay-incompatible
161167
* @requiresRedisVersion >= 2.0.0
162168
*/
163169
public function testCanSendPunsubscribeAfterPsubscribe(): void
@@ -171,6 +177,7 @@ public function testCanSendPunsubscribeAfterPsubscribe(): void
171177

172178
/**
173179
* @group connected
180+
* @group relay-incompatible
174181
* @requiresRedisVersion >= 2.0.0
175182
*/
176183
public function testCanSendQuitAfterPsubscribe(): void
@@ -184,6 +191,7 @@ public function testCanSendQuitAfterPsubscribe(): void
184191

185192
/**
186193
* @group connected
194+
* @group relay-incompatible
187195
* @requiresRedisVersion >= 2.0.0
188196
*/
189197
public function testCannotSendOtherCommandsAfterPsubscribe(): void

‎tests/Predis/Command/Redis/PUNSUBSCRIBE_Test.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/**
1919
* @group commands
2020
* @group realm-pubsub
21-
* @group relay-incompatible
2221
*/
2322
class PUNSUBSCRIBE_Test extends PredisCommandTestCase
2423
{
@@ -98,6 +97,7 @@ public function testPrefixKeys(): void
9897

9998
/**
10099
* @group connected
100+
* @group relay-incompatible
101101
* @requiresRedisVersion >= 2.0.0
102102
*/
103103
public function testDoesNotSwitchToSubscribeMode(): void
@@ -110,6 +110,7 @@ public function testDoesNotSwitchToSubscribeMode(): void
110110

111111
/**
112112
* @group connected
113+
* @group relay-incompatible
113114
* @requiresRedisVersion >= 6.0.0
114115
*/
115116
public function testDoesNotSwitchToSubscribeModeResp3(): void
@@ -123,6 +124,7 @@ public function testDoesNotSwitchToSubscribeModeResp3(): void
123124

124125
/**
125126
* @group connected
127+
* @group relay-incompatible
126128
* @requiresRedisVersion >= 2.0.0
127129
*/
128130
public function testUnsubscribesFromNotSubscribedChannels(): void
@@ -134,6 +136,7 @@ public function testUnsubscribesFromNotSubscribedChannels(): void
134136

135137
/**
136138
* @group connected
139+
* @group relay-incompatible
137140
* @requiresRedisVersion >= 2.0.0
138141
*/
139142
public function testUnsubscribesFromSubscribedChannels(): void
@@ -147,6 +150,7 @@ public function testUnsubscribesFromSubscribedChannels(): void
147150

148151
/**
149152
* @group connected
153+
* @group relay-incompatible
150154
* @requiresRedisVersion >= 2.6.0
151155
*/
152156
public function testUnsubscribesFromAllSubscribedChannels(): void

‎tests/Predis/Command/Redis/SUBSCRIBE_Test.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/**
1919
* @group commands
2020
* @group realm-pubsub
21-
* @group relay-incompatible
2221
*/
2322
class SUBSCRIBE_Test extends PredisCommandTestCase
2423
{
@@ -98,6 +97,7 @@ public function testPrefixKeys(): void
9897

9998
/**
10099
* @group connected
100+
* @group relay-incompatible
101101
* @requiresRedisVersion >= 2.0.0
102102
*/
103103
public function testReturnsTheFirstSubscribedChannelDetails(): void
@@ -109,6 +109,7 @@ public function testReturnsTheFirstSubscribedChannelDetails(): void
109109

110110
/**
111111
* @group connected
112+
* @group relay-incompatible
112113
* @requiresRedisVersion >= 6.0.0
113114
*/
114115
public function testReturnsTheFirstSubscribedChannelDetailsResp3(): void
@@ -121,6 +122,7 @@ public function testReturnsTheFirstSubscribedChannelDetailsResp3(): void
121122

122123
/**
123124
* @group connected
125+
* @group relay-incompatible
124126
* @requiresRedisVersion >= 2.0.0
125127
*/
126128
public function testCanSendSubscribeAfterSubscribe(): void
@@ -133,6 +135,7 @@ public function testCanSendSubscribeAfterSubscribe(): void
133135

134136
/**
135137
* @group connected
138+
* @group relay-incompatible
136139
* @requiresRedisVersion >= 2.0.0
137140
*/
138141
public function testCanSendPsubscribeAfterSubscribe(): void
@@ -145,6 +148,7 @@ public function testCanSendPsubscribeAfterSubscribe(): void
145148

146149
/**
147150
* @group connected
151+
* @group relay-incompatible
148152
* @requiresRedisVersion >= 2.0.0
149153
*/
150154
public function testCanSendUnsubscribeAfterSubscribe(): void
@@ -158,6 +162,7 @@ public function testCanSendUnsubscribeAfterSubscribe(): void
158162

159163
/**
160164
* @group connected
165+
* @group relay-incompatible
161166
* @requiresRedisVersion >= 2.0.0
162167
*/
163168
public function testCanSendPunsubscribeAfterSubscribe(): void
@@ -171,6 +176,7 @@ public function testCanSendPunsubscribeAfterSubscribe(): void
171176

172177
/**
173178
* @group connected
179+
* @group relay-incompatible
174180
* @requiresRedisVersion >= 2.0.0
175181
*/
176182
public function testCanSendQuitAfterSubscribe(): void
@@ -184,6 +190,7 @@ public function testCanSendQuitAfterSubscribe(): void
184190

185191
/**
186192
* @group connected
193+
* @group relay-incompatible
187194
* @requiresRedisVersion >= 2.0.0
188195
*/
189196
public function testCannotSendOtherCommandsAfterSubscribe(): void

0 commit comments

Comments
 (0)
0