mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-07 01:06:48 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [task/session-tests] Make result check independent of returned row order. [task/session-tests] By default the cache check now skips over db server info [task/session-tests] Correctly display message on session continue test failure [task/session-tests] Make the session id replacement of dataset values clearer Conflicts: tests/mock/cache.php
This commit is contained in:
@@ -42,9 +42,16 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
|
||||
$test->assertFalse(isset($this->data[$var_name]));
|
||||
}
|
||||
|
||||
public function check(PHPUnit_Framework_Assert $test, $data)
|
||||
public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)
|
||||
{
|
||||
$test->assertEquals($data, $this->data);
|
||||
$cache_data = $this->data;
|
||||
|
||||
if ($ignore_db_info)
|
||||
{
|
||||
unset($cache_data['mysqli_version']);
|
||||
}
|
||||
|
||||
$test->assertEquals($data, $cache_data);
|
||||
}
|
||||
|
||||
function load()
|
||||
|
Reference in New Issue
Block a user