diff options
| author | Master Yoda <jim_parry@bcit.ca> | 2015-03-07 01:09:48 +0100 |
|---|---|---|
| committer | Master Yoda <jim_parry@bcit.ca> | 2015-03-07 01:09:48 +0100 |
| commit | d46085b99398b08c8620fdcefd8cf0e88408147d (patch) | |
| tree | 939d3c0e26f1aaa8ead59e6a88e592f3ea9b3faa /tests/codeigniter/database/DB_test.php | |
| parent | 7762c59b50b39f00660c820171a647ea6935a93e (diff) | |
| parent | 3b526f46f5f28bc15a3402a895538777056cc9f3 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into fix/housekeeping
Diffstat (limited to 'tests/codeigniter/database/DB_test.php')
| -rw-r--r-- | tests/codeigniter/database/DB_test.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php index d5a9369e6..dc4fae986 100644 --- a/tests/codeigniter/database/DB_test.php +++ b/tests/codeigniter/database/DB_test.php @@ -26,6 +26,14 @@ class DB_test extends CI_TestCase { { $config = Mock_Database_DB::config(DB_DRIVER); $connection = new Mock_Database_DB($config); + + // E_DEPRECATED notices thrown by mysql_connect(), mysql_pconnect() + // on PHP 5.5+ cause the tests to fail + if (DB_DRIVER === 'mysql' && version_compare(PHP_VERSION, '5.5', '>=')) + { + error_reporting(E_ALL & ~E_DEPRECATED); + } + $db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER), TRUE); $this->assertTrue($db instanceof CI_DB); |