X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTestTrait.php;h=9d46259ed1431fb1b35a894b720613a0c898444a;hb=7d1a603ee5e028ab03a56f1512560cffc4aa1028;hp=f667e05de6d1be2bf6fe61421a79c4d4d972c369;hpb=38a5358bfa646ae13a4a1a385741890fa88d9b7f;p=friendica.git

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index f667e05de6..9d46259ed1 100644
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -29,23 +29,25 @@ 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();
+		// Rollback the first, outer transaction just 2 be sure
+		StaticDatabase::getGlobConnection()->rollBack();
 		// 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");
+		}
 	}
 
 	/**
@@ -66,7 +68,7 @@ trait DatabaseTestTrait
 			}
 
 			if (!is_array($rows)) {
-				$dba->p('TRUNCATE TABLE `' . $tableName . '``');
+				$dba->e('TRUNCATE TABLE `' . $tableName . '``');
 				continue;
 			}