Skip to content

Commit 75a4a56

Browse files
oshmyheliukoshmyheliuk
authored
Merge pull request #15 from magento-commerce/MCLOUD-7277
MCLOUD-7277: Fix failed tests on Travis for PHP 7.1
2 parents f1e6f7f + 754730f commit 75a4a56

File tree

6 files changed

+217
-167
lines changed

6 files changed

+217
-167
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ install:
5454
- composer config github-oauth.github.com ${GITHUB_TOKEN}
5555
- if [ -n "${MCC_VERSION}" ]; then composer config repositories.mcc git [email protected]:magento/magento-cloud-components.git && composer require "magento/magento-cloud-components:${MCC_VERSION}" --no-update; fi;
5656
- if [ -n "${MCD_VERSION}" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; fi;
57+
- if [ -n "${MCD_VERSION_71}" ] && [ $TRAVIS_PHP_VERSION == "7.1" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION_71}" --no-update; fi;
5758
- if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git [email protected]:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
5859
- if [ -n "${MQP_VERSION}" ]; then composer config repositories.mqp git [email protected]:magento/quality-patches.git && composer require "magento/quality-patches:${MQP_VERSION}" --no-update; fi;
5960
- composer update -n --no-suggest

‎src/Test/Functional/Acceptance/AdminCredential22Cest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ class AdminCredential22Cest extends AdminCredentialCest
1515
/**
1616
* @var string
1717
*/
18-
protected $magentoCloudTemplate = '2.2.11';
18+
protected $magentoCloudTemplate = '2.2.9';
1919
}

‎src/Test/Functional/Acceptance/RedisPhp71Cest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function defaultConfigurationDataProvider(): array
1919
{
2020
return [
2121
[
22-
'version' => '2.2.11',
22+
'version' => '2.2.9',
2323
],
2424
];
2525
}
@@ -31,7 +31,7 @@ protected function wrongConfigurationDataProvider(): array
3131
{
3232
return [
3333
[
34-
'version' => '2.2.11',
34+
'version' => '2.2.9',
3535
'wrongConfiguration' => [
3636
'stage' => [
3737
'deploy' => [
@@ -46,7 +46,7 @@ protected function wrongConfigurationDataProvider(): array
4646
. '\'\Magento\Framework\Cache\Backend\Redis\'',
4747
],
4848
[
49-
'version' => '2.2.11',
49+
'version' => '2.2.9',
5050
'wrongConfiguration' => [
5151
'stage' => [
5252
'deploy' => [
@@ -71,7 +71,7 @@ protected function goodConfigurationDataProvider(): array
7171
{
7272
return [
7373
[
74-
'version' => '2.2.11',
74+
'version' => '2.2.9',
7575
'backendModel' => [
7676
'stage' => [
7777
'deploy' => [

‎src/Test/Functional/Acceptance/RedisPhp72Cest.php

Lines changed: 9 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ class RedisPhp72Cest extends RedisCest
1818
protected function defaultConfigurationDataProvider(): array
1919
{
2020
return [
21+
[
22+
'version' => '2.2.11',
23+
],
2124
[
2225
'version' => '2.3.0',
2326
],
@@ -74,168 +77,13 @@ protected function wrongConfigurationDataProvider(): array
7477
}
7578

7679
/**
77-
* @return array
78-
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
80+
* @param \CliTester $I
81+
* @param \Codeception\Example $data
82+
* @throws \Robo\Exception\TaskException
83+
* @skip
7984
*/
80-
protected function goodConfigurationDataProvider(): array
85+
public function testGoodConfiguration(\CliTester $I, \Codeception\Example $data): void
8186
{
82-
return [
83-
[
84-
'version' => '2.3.0',
85-
'backendModel' => [
86-
'stage' => [
87-
'deploy' => [
88-
'REDIS_BACKEND' => 'Cm_Cache_Backend_Redis',
89-
],
90-
],
91-
],
92-
'expectedBackend' => 'Cm_Cache_Backend_Redis',
93-
'expectedConfig' => [
94-
'backend_options' => [
95-
'server' => 'redis',
96-
'port' => '6379',
97-
'database' => 1,
98-
],
99-
],
100-
],
101-
[
102-
'version' => '2.3.0',
103-
'backendModel' => [
104-
'stage' => [
105-
'deploy' => [
106-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\Redis',
107-
],
108-
],
109-
],
110-
'expectedBackend' => '\Magento\Framework\Cache\Backend\Redis',
111-
'expectedConfig' => [
112-
'backend_options' => [
113-
'server' => 'redis',
114-
'port' => '6379',
115-
'database' => 1,
116-
],
117-
],
118-
],
119-
[
120-
'version' => '2.3.0',
121-
'backendModel' => [
122-
'stage' => [
123-
'deploy' => [
124-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
125-
],
126-
],
127-
],
128-
'expectedBackend' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
129-
'expectedConfig' => [
130-
'backend_options' => [
131-
'remote_backend' => '\Magento\Framework\Cache\Backend\Redis',
132-
'remote_backend_options' => [
133-
'persistent' => 0,
134-
'server' => 'redis',
135-
'database' => 1,
136-
'port' => '6379',
137-
'password' => '',
138-
'compress_data' => '1',
139-
],
140-
'local_backend' => 'Cm_Cache_Backend_File',
141-
'local_backend_options' => [
142-
'cache_dir' => '/dev/shm/',
143-
]
144-
]
145-
],
146-
],
147-
[
148-
'version' => '2.3.1',
149-
'backendModel' => [
150-
'stage' => [
151-
'deploy' => [
152-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\Redis',
153-
],
154-
],
155-
],
156-
'expectedBackend' => '\Magento\Framework\Cache\Backend\Redis',
157-
'expectedConfig' => [
158-
'backend_options' => [
159-
'server' => 'redis',
160-
'port' => '6379',
161-
'database' => 1,
162-
],
163-
],
164-
],
165-
[
166-
'version' => '2.3.1',
167-
'backendModel' => [
168-
'stage' => [
169-
'deploy' => [
170-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
171-
],
172-
],
173-
],
174-
'expectedBackend' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
175-
'expectedConfig' => [
176-
'backend_options' => [
177-
'remote_backend' => '\Magento\Framework\Cache\Backend\Redis',
178-
'remote_backend_options' => [
179-
'persistent' => 0,
180-
'server' => 'redis',
181-
'database' => 1,
182-
'port' => '6379',
183-
'password' => '',
184-
'compress_data' => '1',
185-
],
186-
'local_backend' => 'Cm_Cache_Backend_File',
187-
'local_backend_options' => [
188-
'cache_dir' => '/dev/shm/',
189-
]
190-
]
191-
],
192-
],
193-
[
194-
'version' => '2.3.2',
195-
'backendModel' => [
196-
'stage' => [
197-
'deploy' => [
198-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\Redis',
199-
],
200-
],
201-
],
202-
'expectedBackend' => '\Magento\Framework\Cache\Backend\Redis',
203-
'expectedConfig' => [
204-
'backend_options' => [
205-
'server' => 'redis',
206-
'port' => '6379',
207-
'database' => 1,
208-
],
209-
],
210-
],
211-
[
212-
'version' => '2.3.2',
213-
'backendModel' => [
214-
'stage' => [
215-
'deploy' => [
216-
'REDIS_BACKEND' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
217-
],
218-
],
219-
],
220-
'expectedBackend' => '\Magento\Framework\Cache\Backend\RemoteSynchronizedCache',
221-
'expectedConfig' => [
222-
'backend_options' => [
223-
'remote_backend' => '\Magento\Framework\Cache\Backend\Redis',
224-
'remote_backend_options' => [
225-
'persistent' => 0,
226-
'server' => 'redis',
227-
'database' => 1,
228-
'port' => '6379',
229-
'password' => '',
230-
'compress_data' => '1',
231-
],
232-
'local_backend' => 'Cm_Cache_Backend_File',
233-
'local_backend_options' => [
234-
'cache_dir' => '/dev/shm/',
235-
]
236-
]
237-
],
238-
],
239-
];
87+
return;
24088
}
24189
}

0 commit comments

Comments
 (0)