summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-09-16 12:29:06 -0700
committerJoffrey F <joffrey@docker.com>2015-09-16 12:55:49 -0700
commit8d3263163547fd9121ac13b01815b4c1740c9947 (patch)
tree316bfa4f79a10aa489fe27a93569a3765463a0d9
parentea9e13ff2b08212e3a7e7ab501698d0f2789fe74 (diff)
downloaddocker-py-744-volume-api-support.tar.gz
Improve volume cleanup logic744-volume-api-support
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--tests/integration_test.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py
index fc49797..b8101c1 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -88,6 +88,7 @@ class BaseTestCase(unittest.TestCase):
self.tmp_imgs = []
self.tmp_containers = []
self.tmp_folders = []
+ self.tmp_volumes = []
def tearDown(self):
for img in self.tmp_imgs:
@@ -1391,8 +1392,8 @@ class TestImportFromURL(ImportTestCase):
class TestVolumes(BaseTestCase):
def test_create_volume(self):
name = 'perfectcherryblossom'
- result = self.client.create_volume(name)
self.tmp_volumes.append(name)
+ result = self.client.create_volume(name)
self.assertIn('Name', result)
self.assertEqual(result['Name'], name)
self.assertIn('Driver', result)
@@ -1406,8 +1407,8 @@ class TestVolumes(BaseTestCase):
def test_list_volumes(self):
name = 'imperishablenight'
- volume_info = self.client.create_volume(name)
self.tmp_volumes.append(name)
+ volume_info = self.client.create_volume(name)
result = self.client.volumes()
self.assertIn('Volumes', result)
volumes = result['Volumes']
@@ -1415,8 +1416,8 @@ class TestVolumes(BaseTestCase):
def test_inspect_volume(self):
name = 'embodimentofscarletdevil'
- volume_info = self.client.create_volume(name)
self.tmp_volumes.append(name)
+ volume_info = self.client.create_volume(name)
result = self.client.inspect_volume(name)
self.assertEqual(volume_info, result)
@@ -1427,8 +1428,8 @@ class TestVolumes(BaseTestCase):
def test_remove_volume(self):
name = 'shootthebullet'
- self.client.create_volume(name)
self.tmp_volumes.append(name)
+ self.client.create_volume(name)
result = self.client.remove_volume(name)
self.assertTrue(result)