X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTestTrait.php;h=7d255c693b5b9ff996b5ee28d4771b15469293ca;hb=0649d2c3934f5b9548bea32e2d17aa830104162d;hp=f667e05de6d1be2bf6fe61421a79c4d4d972c369;hpb=befc2af5043a3afde251721c0d27df695db1bb7e;p=friendica.git

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index f667e05de6..7d255c693b 100644
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -29,23 +29,23 @@ use Friendica\Test\Util\Database\StaticDatabase;
  */
 trait DatabaseTestTrait
 {
-	protected function setUp()
+	protected function setUpDb()
 	{
 		StaticDatabase::statConnect($_SERVER);
 		// Rollbacks every DB usage (in case the test couldn't call tearDown)
 		StaticDatabase::statRollback();
 		// Start the first, outer transaction
 		StaticDatabase::getGlobConnection()->beginTransaction();
-
-		parent::setUp();
 	}
 
-	protected function tearDown()
+	protected function tearDownDb()
 	{
-		// Rollbacks every DB usage so we don't commit anything into the DB
-		StaticDatabase::statRollback();
-
-		parent::tearDown();
+		try {
+			// Rollbacks every DB usage so we don't commit anything into the DB
+			StaticDatabase::statRollback();
+		} catch (\PDOException $exception) {
+			print_r("Found already rolled back transaction");
+		}
 	}
 
 	/**