Explicitly disconnect from database.

The garbage collection of destructed objects doesn't seem to kick-in fast enough to free enough database connection resources for running many tests in a row. At least on my fresh PHP 5.5 installation.
horde · Oct 24, 2013 · fe37ed0 · fe37ed0
1 parent b0f8517
commit fe37ed0
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 0 deletions.
diff --git a/framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php b/framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php
@@ -194,6 +194,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }

diff --git a/framework/Auth/test/Horde/Auth/Unit/Sql/Base.php b/framework/Auth/test/Horde/Auth/Unit/Sql/Base.php
@@ -47,6 +47,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }

diff --git a/framework/Group/test/Horde/Group/Sql/Base.php b/framework/Group/test/Horde/Group/Sql/Base.php
@@ -152,6 +152,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }

diff --git a/framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php b/framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php
@@ -85,6 +85,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
     }
 

diff --git a/framework/Rdo/test/Horde/Rdo/Sql/Base.php b/framework/Rdo/test/Horde/Rdo/Sql/Base.php
@@ -288,6 +288,7 @@ public static function tearDownAfterClass()
             $migration->dropTable('test_manytomanya');
             $migration->dropTable('test_manytomanyb');
             $migration->dropTable('test_manythrough');
+            self::$db->disconnect();
             self::$db = null;
         }
     }

diff --git a/framework/SessionHandler/test/Horde/SessionHandler/Storage/Sql/Base.php b/framework/SessionHandler/test/Horde/SessionHandler/Storage/Sql/Base.php
@@ -95,6 +95,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }

diff --git a/framework/Share/test/Horde/Share/Sql/Base.php b/framework/Share/test/Horde/Share/Sql/Base.php
@@ -205,6 +205,7 @@ public static function tearDownAfterClass()
             $migration->dropTable('test_shares');
             $migration->dropTable('test_shares_groups');
             $migration->dropTable('test_shares_users');
+            self::$db->disconnect();
             self::$db = null;
         }
     }

diff --git a/framework/Share/test/Horde/Share/Sqlng/Base.php b/framework/Share/test/Horde/Share/Sqlng/Base.php
@@ -206,6 +206,7 @@ public static function tearDownAfterClass()
             $migration->dropTable('test_shares');
             $migration->dropTable('test_shares_groups');
             $migration->dropTable('test_shares_users');
+            self::$db->disconnect();
             self::$db = null;
         }
     }

diff --git a/framework/Vfs/test/Horde/Vfs/Sql/Base.php b/framework/Vfs/test/Horde/Vfs/Sql/Base.php
@@ -186,6 +186,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }

diff --git a/framework/Vfs/test/Horde/Vfs/SqlFile/Base.php b/framework/Vfs/test/Horde/Vfs/SqlFile/Base.php
@@ -190,6 +190,7 @@ public static function tearDownAfterClass()
         if (self::$migrator) {
             self::$migrator->down();
         }
+        self::$db->disconnect();
         self::$db = null;
         parent::tearDownAfterClass();
     }