symfony
diff --git a/‎src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
+37-25Lines changed: 37 additions & 25 deletions b/‎src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
+37-25Lines changed: 37 additions & 25 deletions
@@ -246,15 +246,19 @@ public function testLazy()
         $connection = Connection::fromDsn('redis://localhost/messenger-lazy?lazy=1', ['delete_after_ack' => true], $redis);
 
         $connection->add('1', []);
-        $this->assertNotEmpty($message = $connection->get());
-        $this->assertSame([
-            'message' => json_encode([
-                'body' => '1',
-                'headers' => [],
-            ]),
-        ], $message['data']);
-        $connection->reject($message['id']);
-        $redis->del('messenger-lazy');
+
+        try {
+            $this->assertNotEmpty($message = $connection->get());
+            $this->assertSame([
+                'message' => json_encode([
+                    'body' => '1',
+                    'headers' => [],
+                ]),
+            ], $message['data']);
+            $connection->reject($message['id']);
+        } finally {
+            $redis->del('messenger-lazy');
+        }
     }
 
     public function testDbIndex()
@@ -283,13 +287,16 @@ public function testFromDsnWithMultipleHosts()
     public function testJsonError()
     {
         $redis = new \Redis();
-        $connection = Connection::fromDsn('redis://localhost/json-error', ['delete_after_ack' => true], $redis);
+        $connection = Connection::fromDsn('redis://localhost/messenger-json-error', ['delete_after_ack' => true], $redis);
         try {
             $connection->add("\xB1\x31", []);
+
+            $this->fail('Expected exception to be thrown.');
         } catch (TransportException $e) {
+            $this->assertSame('Malformed UTF-8 characters, possibly incorrectly encoded', $e->getMessage());
+        } finally {
+            $redis->del('messenger-json-error');
         }
-
-        $this->assertSame('Malformed UTF-8 characters, possibly incorrectly encoded', $e->getMessage());
     }
 
     public function testGetNonBlocking()
@@ -298,28 +305,33 @@ public function testGetNonBlocking()
 
         $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', ['delete_after_ack' => true], $redis);
 
-        $this->assertNull($connection->get()); // no message, should return null immediately
-        $connection->add('1', []);
-        $this->assertNotEmpty($message = $connection->get());
-        $connection->reject($message['id']);
-        $redis->del('messenger-getnonblocking');
+        try {
+            $this->assertNull($connection->get()); // no message, should return null immediately
+            $connection->add('1', []);
+            $this->assertNotEmpty($message = $connection->get());
+            $connection->reject($message['id']);
+        } finally {
+            $redis->del('messenger-getnonblocking');
+        }
     }
 
     public function testGetAfterReject()
     {
         $redis = new \Redis();
         $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['delete_after_ack' => true], $redis);
 
-        $connection->add('1', []);
-        $connection->add('2', []);
-
-        $failing = $connection->get();
-        $connection->reject($failing['id']);
+        try {
+            $connection->add('1', []);
+            $connection->add('2', []);
 
-        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['delete_after_ack' => true]);
-        $this->assertNotNull($connection->get());
+            $failing = $connection->get();
+            $connection->reject($failing['id']);
 
-        $redis->del('messenger-rejectthenget');
+            $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['delete_after_ack' => true]);
+            $this->assertNotNull($connection->get());
+        } finally {
+            $redis->del('messenger-rejectthenget');
+        }
     }
 
     public function testItProperlyHandlesEmptyMessages()