Merge pull request #3751 from ijc25/master

Tidy up remaining lingering docker.client.Client objects in test suite

tests/integration/resilience_test.py

@@ -20,6 +20,11 @@ class ResilienceTest(DockerClientTestCase):
         self.db.start_container(container)
         self.host_path = container.get_mount('/var/db')['Source']
 
+    def tearDown(self):
+        del self.project
+        del self.db
+        super(ResilienceTest, self).tearDown()
+
     def test_successful_recreate(self):
         self.project.up(strategy=ConvergenceStrategy.always)
         container = self.db.containers()[0]

tests/integration/volume_test.py

@@ -17,6 +17,8 @@ class VolumeTest(DockerClientTestCase):
                 self.client.remove_volume(volume.full_name)
             except DockerException:
                 pass
+        del self.tmp_volumes
+        super(VolumeTest, self).tearDown()
 
     def create_volume(self, name, driver=None, opts=None, external=None):
         if external and isinstance(external, bool):