From 7255ef4f6d9ea8c63036ad32fa376cd03b1b8e9b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 27 Feb 2011 22:17:03 +0100 Subject: [task/session-tests] By default the cache check now skips over db server info PHPBB3-9732 --- tests/mock/cache.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/mock/cache.php') diff --git a/tests/mock/cache.php b/tests/mock/cache.php index 2ac46f7090..738d1eaaba 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -53,9 +53,16 @@ class phpbb_mock_cache $test->assertEquals($data, $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); } } -- cgit v1.2.1 From 7a39bdef890a4c781eda8ad03a6e3821a9f339df Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 12 Mar 2011 15:26:09 +0100 Subject: [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock. PHPBB3-10088 --- tests/mock/cache.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/mock/cache.php') diff --git a/tests/mock/cache.php b/tests/mock/cache.php index 738d1eaaba..11e525ff79 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -59,7 +59,12 @@ class phpbb_mock_cache if ($ignore_db_info) { + unset($cache_data['mssqlodbc_version']); + unset($cache_data['mssql_version']); + unset($cache_data['mysql_version']); unset($cache_data['mysqli_version']); + unset($cache_data['pgsql_version']); + unset($cache_data['sqlite_version']); } $test->assertEquals($data, $cache_data); -- cgit v1.2.1