From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 17 Jan 2011 18:48:06 +0000 (-0500)
Subject: Don't fatal, just skip tests, if the database adapter can't be created.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=06c018f30065e8452410e80f4ddefcef7a684a8b;p=horde.git

Don't fatal, just skip tests, if the database adapter can't be created.
---

diff --git a/framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php b/framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php
index 45c19af39..14decb6e2 100644
--- a/framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php
+++ b/framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php
@@ -22,7 +22,11 @@ class Horde_Share_Sql_Pdo_MysqlTest extends Horde_Share_Test_Sql_Base
         }
         $config = self::getConfig('SHARE_SQL_PDO_MYSQL_TEST_CONFIG');
         if ($config) {
-            self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
+            try {
+                self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
+            } catch (Horde_Db_Exception $e) {
+                return;
+            }
             parent::setUpBeforeClass();
         }
     }
diff --git a/framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php b/framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php
index 7d4f9c651..253ced45c 100644
--- a/framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php
+++ b/framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php
@@ -22,7 +22,11 @@ class Horde_Share_Sql_Pdo_PgsqlTest extends Horde_Share_Test_Sql_Base
         }
         $config = self::getConfig('SHARE_SQL_PDO_PGSQL_TEST_CONFIG');
         if ($config) {
-            self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
+            try {
+                self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
+            } catch (Horde_Db_Exception $e) {
+                return;
+            }
             parent::setUpBeforeClass();
         }
     }
diff --git a/framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php b/framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php
index 005b6f7a1..2df5dd529 100644
--- a/framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php
+++ b/framework/Share/test/Horde/Share/Sql/Pdo/SqliteTest.php
@@ -20,7 +20,11 @@ class Horde_Share_Sql_Pdo_SqliteTest extends Horde_Share_Test_Sql_Base
             !in_array('sqlite', PDO::getAvailableDrivers())) {
             return;
         }
-        self::$db = new Horde_Db_Adapter_Pdo_Sqlite(array('dbname' => ':memory:', 'charset' => 'utf-8'));
+        try {
+            self::$db = new Horde_Db_Adapter_Pdo_Sqlite(array('dbname' => ':memory:', 'charset' => 'utf-8'));
+        } catch (Horde_Db_Exception $e) {
+            return;
+        }
         parent::setUpBeforeClass();
     }
 }
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
index 4b83419bf..f0324735f 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/MysqlTest.php
@@ -22,7 +22,11 @@ class Horde_Share_SqlHierarchical_Pdo_MysqlTest extends Horde_Share_Test_SqlHier
         }
         $config = self::getConfig('SHARE_SQL_PDO_MYSQL_TEST_CONFIG');
         if ($config) {
-            self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
+            try {
+                self::$db = new Horde_Db_Adapter_Pdo_Mysql($config['share']['sql']['pdo_mysql']);
+            } catch (Horde_Db_Exception $e) {
+                return;
+            }
             parent::setUpBeforeClass();
         }
     }
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
index 1bf63d552..a4d3f927b 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/PgsqlTest.php
@@ -22,7 +22,11 @@ class Horde_Share_SqlHierarchical_Pdo_PgsqlTest extends Horde_Share_Test_SqlHier
         }
         $config = self::getConfig('SHARE_SQL_PDO_PGSQL_TEST_CONFIG');
         if ($config) {
-            self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
+            try {
+                self::$db = new Horde_Db_Adapter_Pdo_Pgsql($config['share']['sql']['pdo_pgsql']);
+            } catch (Horde_Db_Exception $e) {
+                return;
+            }
             parent::setUpBeforeClass();
         }
     }
diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php
index 2ae72fdcc..3b81f5e57 100644
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Pdo/SqliteTest.php
@@ -20,7 +20,11 @@ class Horde_Share_SqlHierarchical_Pdo_SqliteTest extends Horde_Share_Test_SqlHie
             !in_array('sqlite', PDO::getAvailableDrivers())) {
             return;
         }
-        self::$db = new Horde_Db_Adapter_Pdo_Sqlite(array('dbname' => ':memory:', 'charset' => 'utf-8'));
+        try {
+            self::$db = new Horde_Db_Adapter_Pdo_Sqlite(array('dbname' => ':memory:', 'charset' => 'utf-8'));
+        } catch (Horde_Db_Exception $e) {
+            return;
+        }
         parent::setUpBeforeClass();
     }
 }