Removes redundant closing statements.

salt/transport/__init__.py

@@ -67,9 +67,3 @@ class MessageClientPool(object):
             kwargs = {}
 
         self.message_clients = [tgt(*args, **kwargs) for _ in range(sock_pool_size)]
-
-    def __del__(self):
-        while self.message_clients:
-            message_client = self.message_clients.pop()
-            if message_client is not None:
-                del message_client

salt/transport/tcp.py

@@ -776,6 +776,7 @@ class SaltMessageClientPool(salt.transport.MessageClientPool):
     def close(self):
         for message_client in self.message_clients:
             message_client.close()
+        self.message_clients = []
 
     @tornado.gen.coroutine
     def connect(self):

salt/transport/zeromq.py

@@ -828,6 +828,7 @@ class AsyncReqMessageClientPool(salt.transport.MessageClientPool):
     def destroy(self):
         for message_client in self.message_clients:
             message_client.destroy()
+        self.message_clients = []
 
     def send(self, *args, **kwargs):
         message_clients = sorted(self.message_clients, key=lambda x: len(x.send_queue))

tests/unit/transport/tcp_test.py

@@ -238,11 +238,8 @@ class SaltMessageClientPoolTest(AsyncTestCase):
         self.assertEqual([1], self.message_client_pool.write_to_stream(''))
 
     def test_close(self):
-        for message_client_mock in self.message_client_pool.message_clients:
-            message_client_mock.close.return_value = None
         self.message_client_pool.close()
-        for message_client_mock in self.message_client_pool.message_clients:
-            self.assertTrue(message_client_mock.close.called)
+        self.assertEqual([], self.message_client_pool.message_clients)
 
     def test_on_recv(self):
         for message_client_mock in self.message_client_pool.message_clients:

tests/unit/transport/zeromq_test.py

@@ -253,12 +253,8 @@ class AsyncReqMessageClientPoolTest(TestCase):
         self.assertEqual([1], self.message_client_pool.send())
 
     def test_destroy(self):
-        for message_client_mock in self.message_client_pool.message_clients:
-            message_client_mock.destroy.return_value = None
-
         self.message_client_pool.destroy()
-        for message_client_mock in self.message_client_pool.message_clients:
-            self.assertTrue(message_client_mock.destroy.called)
+        self.assertEqual([], self.message_client_pool.message_clients)
 
 
 if __name__ == '__main__':