mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity

MDL-83811 dml: Make expected debugging message less specific

Browse Source 
* Plus minor fixes for better unit test assertions
This commit is contained in:
Jun Pataleta 2024-11-26 18:51:39 +08:00
parent 4e22073a9b
commit e84d95ed67
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/dml/tests/dml_mysqli_read_replica_test.php
View File

@ -158,19 +158,18 @@ final class dml_mysqli_read_replica_test extends \database_driver_testcase {
$this->resetDebugging();
$db2 = \moodle_database::get_driver_instance($cfg->dbtype, $cfg->dblibrary);
$db2->connect($cfg->dbhost, $cfg->dbuser, $cfg->dbpass, $cfg->dbname, $cfg->prefix, $cfg->dboptions);
$this->assertTrue(count($db2->get_records('user')) > 0);
$this->assertNotEmpty($db2->get_records('user'));
$debugging = array_map(function ($d) {
return $d->message;
}, $this->getDebuggingMessages());
$this->resetDebugging();
$this->assertEquals(2, count($debugging));
$this->assertCount(2, $debugging);
$this->assertMatchesRegularExpression(
sprintf(
'/%s%s/',
preg_quote("Readonly db connection failed for host {$invalidhost}:"),
'.* Name or service not known',
$cfg->dbname
'.*'
),
$debugging[0]
);
@ -214,22 +213,23 @@ final class dml_mysqli_read_replica_test extends \database_driver_testcase {
return $d->message;
}, $this->getDebuggingMessages());
$this->resetDebugging();
$this->assertEquals(2, count($debugging));
$this->assertCount(2, $debugging);
// Read-only attempt to connect to the non-existent replica database will fail.
// Note: The expected regex pattern is a bit generic because the actual error message may vary between operating systems.
$this->assertMatchesRegularExpression(
sprintf(
'/%s%s/',
preg_quote("Readonly db connection failed for host {$cfg->dbhost}: "),
"Access denied for user .* to database '$invaliddb'",
$cfg->dbname
".* database '$invaliddb'"
),
$debugging[0]
);
// Read-write attempt to connect to the non-existent replica database will also fail.
$this->assertMatchesRegularExpression(
sprintf(
'/%s%s/',
preg_quote("Readwrite db connection failed for host {$cfg->dbhost}: "),
'Access denied for user .* '.preg_quote("to database '$invaliddb'"),
$cfg->dbname
".* '$invaliddb"
),
$debugging[1]
);

10
lib/dml/tests/dml_pgsql_read_replica_test.php
View File

@ -282,22 +282,24 @@ class dml_pgsql_read_replica_test extends \advanced_testcase {
$this->resetDebugging();
$db2 = moodle_database::get_driver_instance($cfg->dbtype, $cfg->dblibrary);
$db2->connect($cfg->dbhost, $cfg->dbuser, $cfg->dbpass, $cfg->dbname, $cfg->prefix, $cfg->dboptions);
$this->assertTrue(count($db2->get_records('user')) > 0);
$this->assertNotEmpty($db2->get_records('user'));
$debugging = array_map(function ($d) {
return $d->message;
}, $this->getDebuggingMessages());
$this->resetDebugging();
$this->assertEquals(2, count($debugging));
$this->assertCount(2, $debugging);
// Attempt to connect to the non-existent replica host will fail.
// Note: The expected regex pattern is a bit generic because the actual error message may vary between operating systems.
$this->assertMatchesRegularExpression(
sprintf(
'/%s%s/',
preg_quote("Readonly db connection failed for host {$invalidhost}: "),
'.* Name or service not known',
$cfg->dbname
'.*'
),
$debugging[0]
);
// Attempt to connect to the existing DB host will succeed.
$this->assertEquals("Readwrite db connection succeeded for host {$cfg->dbhost}", $debugging[1]);
}
}