summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-19 14:13:39 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-19 14:13:39 +0100
commit54fb6f68f1d793b9582dae455b2022e2ecfd3247 (patch)
treea6342f05c0fc629d7d7b449ae7f105cecbba13af
parent6c7c8917d853bcd4acdce930b9afa537b2fb8b95 (diff)
test_db_failover is failing after 'autoinit' removal ...
-rw-r--r--tests/codeigniter/database/DB_test.php3
-rw-r--r--tests/mocks/database/db.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index d5c0dea08..0c3df3fc4 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -34,6 +34,9 @@ class DB_test extends CI_TestCase {
// ------------------------------------------------------------------------
+ /**
+ * @expectedException RuntimeException
+ */
public function test_db_failover()
{
$config = Mock_Database_DB::config(DB_DRIVER);
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php
index 5216be2d7..00dd884b0 100644
--- a/tests/mocks/database/db.php
+++ b/tests/mocks/database/db.php
@@ -133,7 +133,7 @@ class Mock_Database_DB {
}
catch (Exception $e)
{
- throw new InvalidArgumentException($e->getMessage());
+ throw new RuntimeException($e->getMessage());
}
return $db;