Skip to content

Commit a904a3a

Browse files
vladvildanovvladvildanov
authored
Backport #1517 (#1518)
* Backport #1517 * Added versions restrictions * Removed Relay for cluster with coverage * Added phpcov package
1 parent 8b240d1 commit a904a3a

23 files changed

+153
-44
lines changed

‎.github/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
- standalone
3838

3939
redis-cluster:
40-
image: ${REDIS_CLUSTER_IMAGE_NAME:-redislabs/client-libs-test:7.4.2}
40+
image: ${REDIS_IMAGE_NAME:-redislabs/client-libs-test:7.4.2}
4141
container_name: redis-cluster
4242
environment:
4343
- REDIS_CLUSTER=yes

‎.github/workflows/tests.yml

+63-18
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,28 @@ jobs:
4444
["6.2"]="6.2.17"
4545
)
4646
47+
# Mapping of redis version to stack version
48+
declare -A redis_stack_version_mapping=(
49+
["7.4"]="rs-7.4.0-v3"
50+
["7.2"]="rs-7.2.0-v15"
51+
["6.2"]="rs-6.2.6-v19"
52+
)
53+
4754
if [[ -v redis_clients_version_mapping[${{ matrix.redis }}] ]]; then
4855
echo "REDIS_IMAGE_NAME=redislabs/client-libs-test:${redis_clients_version_mapping[${{ matrix.redis }}]}" >> $GITHUB_ENV
56+
echo "REDIS_STACK_IMAGE_NAME=redislabs/client-libs-test:${redis_stack_version_mapping[${{ matrix.redis }}]}" >> $GITHUB_ENV
4957
echo "DOCKER_SERVICE=redis-clients" >> $GITHUB_ENV
5058
5159
redis_major_version=$(echo "${{ matrix.redis }}" | grep -oP '^\d+')
5260
5361
# Some configuration options available since Redis > 7
5462
if (( redis_major_version < 7 )); then
5563
echo "REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"" >> $GITHUB_ENV
64+
else
65+
# Since 8.0 modules are bundled with core
66+
echo "REDIS_STACK_SERVER_PORT=6379" >> $GITHUB_ENV
5667
fi
68+
5769
else
5870
echo "REDIS_IMAGE_NAME=redis:${{ matrix.redis }}" >> $GITHUB_ENV
5971
echo "DOCKER_SERVICE=redis-official" >> $GITHUB_ENV
@@ -69,15 +81,17 @@ jobs:
6981
services: ${{ env.DOCKER_SERVICE }}
7082

7183
- name: Start Redis stack image
84+
id: stack_infra
7285
uses: hoverkraft-tech/[email protected]
73-
if: ${{ matrix.redis == '7.4' }}
86+
if: ${{ matrix.redis >= '6.2' && matrix.redis < '8.0' }}
7487
with:
7588
compose-file: .github/docker-compose.yml
7689
services: redis-stack
7790

7891
- name: Start Redis cluster image
92+
id: cluster_infra
7993
uses: hoverkraft-tech/[email protected]
80-
if: ${{ matrix.redis == '7.4' }}
94+
if: ${{ matrix.redis > '4.0' }}
8195
with:
8296
compose-file: .github/docker-compose.yml
8397
services: redis-cluster
@@ -87,7 +101,7 @@ jobs:
87101
with:
88102
php-version: ${{ matrix.php }}
89103
extensions: relay
90-
coverage: ${{ (matrix.php == '8.1' && matrix.redis == '7.4') && 'xdebug' || 'none' }}
104+
coverage: ${{ (matrix.php == '8.4' && matrix.redis == '7.4') && 'xdebug' || 'none' }}
91105

92106
- name: Install Composer dependencies
93107
uses: ramsey/composer-install@v2
@@ -96,43 +110,74 @@ jobs:
96110
composer-options: ${{ matrix.php == '8.0' && '--ignore-platform-reqs' || '' }}
97111

98112
- name: Run tests
99-
if: ${{ matrix.php != '8.1' || matrix.redis != '7.4' }}
113+
if: ${{ matrix.php != '8.4' || matrix.redis != '7.4' }}
100114
run: vendor/bin/phpunit
101115

102116
- name: Run tests with coverage
103-
if: ${{ matrix.php == '8.1' && matrix.redis == '7.4' }}
104-
run: vendor/bin/phpunit --coverage-clover build/logs/clover-default.xml --coverage-filter ./src
117+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' }}
118+
run: vendor/bin/phpunit --coverage-php build/cov/coverage-predis.cov --coverage-filter ./src
105119

106120
- name: Run tests using Relay
107121
if: ${{ matrix.php != '8.4' && matrix.redis >= '6.2' }}
108122
run: vendor/bin/phpunit -c phpunit.relay.xml
109123

110124
- name: Run tests using Relay with coverage
111-
if: ${{ matrix.php == '8.1' && matrix.redis == '7.4' }}
112-
run: vendor/bin/phpunit -c phpunit.relay.xml --coverage-clover build/logs/clover-relay.xml --coverage-filter ./src
125+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' }}
126+
run: vendor/bin/phpunit -c phpunit.relay.xml --coverage-php build/cov/coverage-relay.cov --coverage-filter ./src
113127

114128
- name: Run stack tests
115-
if: ${{ matrix.redis == '7.4' }}
129+
if: ${{ (matrix.php != '8.4' || matrix.redis != '7.4') && matrix.redis >= '6.2' }}
116130
run: vendor/bin/phpunit --group realm-stack
117131

132+
- name: Run stack tests with coverage
133+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' && steps.stack_infra.conclusion == 'success' }}
134+
run: vendor/bin/phpunit --group realm-stack --coverage-php build/cov/coverage-stack.cov --coverage-filter ./src
135+
env:
136+
REDIS_STACK_SERVER_PORT: 6479
137+
118138
- name: Run stack tests using Relay
119-
if: ${{ matrix.redis == '7.4' }}
139+
if: ${{ matrix.php != '8.4' && matrix.redis == '7.4' }}
120140
run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml
121141

142+
- name: Run stack tests using Relay with coverage
143+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' }}
144+
run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml --coverage-php build/cov/coverage-stack-relay.cov --coverage-filter ./src
145+
env:
146+
REDIS_STACK_SERVER_PORT: 6479
147+
122148
- name: Run tests against cluster
123-
if: ${{ matrix.redis == '7.4' }}
149+
if: ${{ (matrix.php != '8.4' || matrix.redis != '7.4') && steps.cluster_infra.conclusion == 'success' }}
124150
run: |
125151
vendor/bin/phpunit --group cluster
126152
153+
- name: Run tests against cluster with coverage
154+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' && steps.cluster_infra.conclusion == 'success' }}
155+
run: |
156+
vendor/bin/phpunit --group cluster --coverage-php build/cov/coverage-cluster.cov --coverage-filter ./src
157+
127158
- name: Run tests against cluster using Relay
128-
if: ${{ matrix.redis == '7.4' }}
159+
if: ${{ matrix.php != '8.4' && matrix.redis == '7.4' }}
129160
run: |
130161
vendor/bin/phpunit -c phpunit.relay.xml --group cluster
131162
163+
- name: Merge coverage reports
164+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' }}
165+
run: php vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
166+
132167
- name: Send coverage to Coveralls
133-
env:
134-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135-
if: ${{ env.COVERALLS_REPO_TOKEN && matrix.php == '8.1' && matrix.redis == '7.4' }}
136-
run: |
137-
wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.3/php-coveralls.phar"
138-
php ./php-coveralls.phar -v
168+
uses: coverallsapp/github-action@v2
169+
if: ${{ matrix.php == '8.4' && matrix.redis == '7.4' }}
170+
with:
171+
github-token: ${{ secrets.GITHUB_TOKEN }}
172+
parallel: true
173+
174+
finish:
175+
name: Finish Coverall
176+
needs: predis
177+
if: ${{ always() }}
178+
runs-on: ubuntu-latest
179+
steps:
180+
- name: Coveralls Finished
181+
uses: coverallsapp/github-action@v2
182+
with:
183+
parallel-finished: true

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"require-dev": {
2828
"friendsofphp/php-cs-fixer": "^3.3",
2929
"phpstan/phpstan": "^1.9",
30-
"phpunit/phpunit": "^8.0 || ^9.4"
30+
"phpunit/phpunit": "^8.0 || ^9.4",
31+
"phpunit/phpcov": "^6.0 || ^8.0"
3132
},
3233
"suggest": {
3334
"ext-relay": "Faster connection with in-memory caching (>=0.6.2)"

‎phpunit.relay.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<php>
3939
<const name="REDIS_SERVER_HOST" value="127.0.0.1" />
4040
<const name="REDIS_SERVER_PORT" value="6379" />
41-
<const name="REDIS_STACK_SERVER_PORT" value="6479" />
4241
<const name="REDIS_SERVER_DBNUM" value="0" />
4342
<env name="USE_RELAY" value="true" />
43+
<env name="REDIS_STACK_SERVER_PORT" value="6479" />
4444

4545
<!-- Redis Cluster -->
4646
<!-- Only master nodes endpoints included -->

‎phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<php>
5151
<const name="REDIS_SERVER_HOST" value="127.0.0.1" />
5252
<const name="REDIS_SERVER_PORT" value="6379" />
53-
<const name="REDIS_STACK_SERVER_PORT" value="6479" />
5453
<const name="REDIS_SERVER_DBNUM" value="0" />
5554
<env name="USE_RELAY" value="false" />
55+
<env name="REDIS_STACK_SERVER_PORT" value="6479" />
5656

5757
<!-- Redis Cluster -->
5858
<!-- Only master nodes endpoints included -->

‎tests/PHPUnit/PredisTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ protected function getDefaultParametersArray(): array
175175
return [
176176
'scheme' => 'tcp',
177177
'host' => constant('REDIS_SERVER_HOST'),
178-
'port' => ($this->isStackTest()) ? constant('REDIS_STACK_SERVER_PORT') : constant('REDIS_SERVER_PORT'),
178+
'port' => ($this->isStackTest()) ? getenv('REDIS_STACK_SERVER_PORT') : constant('REDIS_SERVER_PORT'),
179179
'database' => constant('REDIS_SERVER_DBNUM'),
180180
];
181181
}

‎tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
124124
$redis = $this->getClient();
125125

126126
$this->expectException(ServerException::class);
127-
$this->expectExceptionMessage('index: no such index');
128127

129128
$redis->ftaggregate('index', 'query');
130129
}

‎tests/Predis/Command/Redis/Search/FTALIASADD_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
9494
$redis = $this->getClient();
9595

9696
$this->expectException(ServerException::class);
97-
$this->expectExceptionMessage('Unknown index name (or name is an alias itself)');
9897

9998
$redis->ftaliasadd('alias', 'index');
10099
}

‎tests/Predis/Command/Redis/Search/FTALIASUPDATE_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
109109
$redis = $this->getClient();
110110

111111
$this->expectException(ServerException::class);
112-
$this->expectExceptionMessage('Unknown index name (or name is an alias itself)');
113112

114113
$redis->ftaliasupdate('alias', 'index');
115114
}

‎tests/Predis/Command/Redis/Search/FTALTER_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
8888
$redis = $this->getClient();
8989

9090
$this->expectException(ServerException::class);
91-
$this->expectExceptionMessage('Unknown index name');
9291

9392
$redis->ftalter('alias', [new TextField('field_name')]);
9493
}

‎tests/Predis/Command/Redis/Search/FTCONFIG_Test.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function testParseResponse(): void
9191
* @group connected
9292
* @group relay-resp3
9393
* @return void
94-
* @requiresRedisVersion <= 7.3.0
94+
* @requiresRedisVersion <= 7.0.0
9595
*/
9696
public function testSetGivenRediSearchConfigurationParameter(): void
9797
{
@@ -104,7 +104,7 @@ public function testSetGivenRediSearchConfigurationParameter(): void
104104
* @group connected
105105
* @group relay-resp3
106106
* @return void
107-
* @requiresRedisVersion <= 7.3.0
107+
* @requiresRedisVersion <= 7.0.0
108108
*/
109109
public function testGetReturnsGivenRediSearchConfigurationParameter(): void
110110
{
@@ -118,7 +118,7 @@ public function testGetReturnsGivenRediSearchConfigurationParameter(): void
118118
* @group connected
119119
* @group relay-resp3
120120
* @return void
121-
* @requiresRedisVersion <= 7.3.0
121+
* @requiresRedisVersion <= 7.0.0
122122
*/
123123
public function testHelpReturnsGivenRediSearchConfigurationDescription(): void
124124
{
@@ -141,14 +141,13 @@ public function testHelpReturnsGivenRediSearchConfigurationDescription(): void
141141
* @group connected
142142
* @group relay-resp3
143143
* @return void
144-
* @requiresRedisVersion <= 7.3.0
144+
* @requiresRedisVersion <= 7.0.0
145145
*/
146146
public function testSetThrowsExceptionOnNonExistingOption(): void
147147
{
148148
$redis = $this->getClient();
149149

150150
$this->expectException(ServerException::class);
151-
$this->expectExceptionMessage('Invalid option');
152151

153152
$redis->ftconfig->set('foobar', 'value');
154153
}

‎tests/Predis/Command/Redis/Search/FTCURSOR_Test.php

-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public function testReadThrowsExceptionOnWrongCursorId(): void
188188
$redis = $this->getClient();
189189

190190
$this->expectException(ServerException::class);
191-
$this->expectExceptionMessage('Cursor not found');
192191

193192
$redis->ftcursor->read('idx', 21412412);
194193
}
@@ -204,7 +203,6 @@ public function testDelThrowsExceptionOnWrongCursorId(): void
204203
$redis = $this->getClient();
205204

206205
$this->expectException(ServerException::class);
207-
$this->expectExceptionMessage('Cursor does not exist');
208206

209207
$redis->ftcursor->del('idx', 21412412);
210208
}

‎tests/Predis/Command/Redis/Search/FTDICTDUMP_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ public function testDumpTermsFromGivenDictionary(): void
7878
* @group connected
7979
* @return void
8080
* @requiresRediSearchVersion >= 1.4.0
81+
* @requiresRedisVersion <= 7.9.0
8182
*/
8283
public function testThrowsExceptionOnNonExistingDictionary(): void
8384
{
8485
$redis = $this->getClient();
8586

8687
$this->expectException(ServerException::class);
87-
$this->expectExceptionMessage('could not open dict key');
8888

8989
$redis->ftdictdump('dict');
9090
}

‎tests/Predis/Command/Redis/Search/FTDROPINDEX_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
8585
$redis = $this->getClient();
8686

8787
$this->expectException(ServerException::class);
88-
$this->expectExceptionMessage('Unknown Index name');
8988

9089
$redis->ftdropindex('index');
9190
}

‎tests/Predis/Command/Redis/Search/FTEXPLAIN_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public function testParseResponse(): void
6464
* @group relay-resp3
6565
* @return void
6666
* @requiresRediSearchVersion >= 1.0.0
67+
* @requiresRedisVersion <= 7.9.0
6768
*/
6869
public function testExplainReturnsExecutionPlanForGivenQuery(): void
6970
{
@@ -119,7 +120,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
119120
$redis = $this->getClient();
120121

121122
$this->expectException(ServerException::class);
122-
$this->expectExceptionMessage('index: no such index');
123123

124124
$redis->ftexplain('index', 'query');
125125
}

‎tests/Predis/Command/Redis/Search/FTPROFILE_Test.php

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public function testThrowsExceptionOnNonExistingIndex(): void
8888
$redis = $this->getClient();
8989

9090
$this->expectException(ServerException::class);
91-
$this->expectExceptionMessage('index: no such index');
9291

9392
$redis->ftprofile('index', (new ProfileArguments())->search()->query('query'));
9493
}

0 commit comments

Comments
 (0)