Merge v1.21 into v1.x (#1654)

Author: jmikola

Diff for: tests/FunctionalTestCase.php

@@ -17,7 +17,6 @@
 use MongoDB\Operation\DatabaseCommand;
 use MongoDB\Operation\ListCollections;
 use stdClass;
-use Throwable;
 use UnexpectedValueException;
 
 use function array_intersect_key;
@@ -70,15 +69,12 @@ public function setUp(): void
         $this->configuredFailPoints = [];
     }
 
-    protected function onNotSuccessfulTest(Throwable $t): never
-    {
-        $this->cleanupCollections();
-
-        throw $t;
-    }
-
     public function tearDown(): void
     {
+        if ($this->status()->isSuccess()) {
+            $this->cleanupCollections();
+        }
+
         $this->disableFailPoints();
 
         parent::tearDown();