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

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Jan 8, 2021 · f0c6cfd · f0c6cfd
1 parent dc00c8a
commit f0c6cfd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
@@ -261,7 +261,12 @@ public static function tearDownAfterClass(): void {
 		}
 		$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);