Skip to content

Commit f7e2997

Browse files
authored
Merge pull request #103 from stronk7/redis_session_tests_are_back
Enable Redis session tests back for PHP 7.2 and up
2 parents 6a84650 + fc0fe74 commit f7e2997

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ services: docker
33
fast_finish: true
44
env:
55
# Oracle jobs have been removed because there aren't public images anymore.
6-
- "PHP=7.3 DB=pgsql GIT=v3.7.0 SUITE=phpunit-full"
6+
# We have set the "phpunit-full" to run against master because it's the
7+
# weekly (3.8dev) where redis was fixed (MDL-60978). Once we have any working release
8+
# including that fix, we'll be able to move back to tagged versions.
9+
- "PHP=7.3 DB=pgsql GIT=master SUITE=phpunit-full"
710
- "PHP=7.2 DB=pgsql GIT=v3.7.0 SUITE=phpunit"
811
- "PHP=7.1 DB=pgsql GIT=v3.7.0 SUITE=phpunit"
912
- "PHP=7.0 DB=pgsql GIT=v3.3.5 SUITE=phpunit"

config.docker-template.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@
5858
define('TEST_SEARCH_SOLR_INDEXNAME', 'test');
5959
define('TEST_SEARCH_SOLR_PORT', 8983);
6060

61-
// We need to keep Redis session tests disabled for PHP 7.2 and up. See MDL-60978.
62-
if (version_compare(PHP_VERSION, '7.2.0', '<')) {
63-
define('TEST_SESSION_REDIS_HOST', 'redis');
64-
}
65-
61+
define('TEST_SESSION_REDIS_HOST', 'redis');
6662
define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'redis');
6763

6864
define('TEST_CACHESTORE_MONGODB_TESTSERVER', 'mongodb://mongo:27017');

0 commit comments

Comments
 (0)