moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-81794-main' of https://github.com/meirzamoodle/moodle

Browse source
This commit is contained in:
Andrew Nicols 2024-06-06 10:44:53 +08:00 • committed by Jun Pataleta
commit 8a92cb82a6
No known key found for this signature in database
GPG key ID: F83510526D99E2C7
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/tests/session_redis_test.php
View file

@ -69,13 +69,14 @@ class session_redis_test extends \advanced_testcase {
$this->keyprefix = 'phpunit'.rand(1, 100000);
$CFG->session_redis_host = TEST_SESSION_REDIS_HOST;
if (strpos(TEST_SESSION_REDIS_HOST, ':')) {
list($server, $port) = explode(':', TEST_SESSION_REDIS_HOST);
} else {
$server = TEST_SESSION_REDIS_HOST;
$port = 6379;
}
$CFG->session_redis_host = $server;
$CFG->session_redis_port = $port;
$opts = [];
if (defined('TEST_SESSION_REDIS_ENCRYPT') && TEST_SESSION_REDIS_ENCRYPT) {
@ -344,10 +345,10 @@ class session_redis_test extends \advanced_testcase {
$actual = $e->getMessage();
}
$host = TEST_SESSION_REDIS_HOST;
if ($this->encrypted) {
$host = "tls://$host";
}
// The Redis session test config allows the user to put the port number inside the host. e.g. 127.0.0.1:6380.
// Therefore, to get the host, we need to explode it.
list($host, ) = explode(':', TEST_SESSION_REDIS_HOST);
$expected = "Failed to connect (try 5 out of 5) to Redis at $host:111111";
$this->assertDebuggingCalledCount(5);
$this->assertStringContainsString($expected, $actual);
@ -367,7 +368,8 @@ class session_redis_test extends \advanced_testcase {
$sess = new \core\session\redis();
$prop = new \ReflectionProperty(\core\session\redis::class, 'host');
$this->assertEquals('tls://' . TEST_SESSION_REDIS_HOST, $prop->getValue($sess)[0]);
$prop = new \ReflectionProperty(\core\session\redis::class, 'sslopts');
$this->assertEquals($CFG->session_redis_encrypt, $prop->getValue($sess));
}
}