Rollback failed transactions in TestCase.php to not break followup tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index 69cf2a39792..6cadf9693c3 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -261,7 +261,12 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 		}
 		$dataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
 		if (self::$wasDatabaseAllowed && \OC::$server->getDatabaseConnection()) {
-			$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+			$db = \OC::$server->getDatabaseConnection();
+			if ($db->inTransaction()) {
+				$db->rollBack();
+				throw new \Exception('There was a transaction still in progress and needed to be rolled back. Please fix this in your test.');
+			}
+			$queryBuilder = $db->getQueryBuilder();
 
 			self::tearDownAfterClassCleanShares($queryBuilder);
 			self::tearDownAfterClassCleanStorages($queryBuilder);