Add assert to delete multiple test

Make sure calls are made to delete both volumes. Also removed redundant fields in v1 fake volume. Closes-Bug: #1253142 Change-Id: I51078041c6d765f28edb155d44928286ee2b0dd6
openstack · Nov 28, 2013 · c33dd1b · c33dd1b
1 parent 5aaa68f
commit c33dd1b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/cinderclient/tests/v1/fakes.py b/cinderclient/tests/v1/fakes.py
@@ -35,8 +35,6 @@ def _stub_volume(**kwargs):
         "bootable": "false",
         "availability_zone": "cinder",
         "created_at": "2012-08-27T00:00:00.000000",
-        "display_description": None,
-        "display_name": None,
         "id": '00000000-0000-0000-0000-000000000000',
         "metadata": {},
         "size": 1,

diff --git a/cinderclient/tests/v1/test_shell.py b/cinderclient/tests/v1/test_shell.py
@@ -124,6 +124,7 @@ def test_delete_by_name(self):
 
     def test_delete_multiple(self):
         self.run_command('delete 1234 5678')
+        self.assert_called_anytime('DELETE', '/volumes/1234')
         self.assert_called('DELETE', '/volumes/5678')
 
     def test_backup(self):

diff --git a/cinderclient/tests/v2/test_shell.py b/cinderclient/tests/v2/test_shell.py
@@ -102,6 +102,7 @@ def test_delete_by_name(self):
 
     def test_delete_multiple(self):
         self.run_command('delete 1234 5678')
+        self.assert_called_anytime('DELETE', '/volumes/1234')
         self.assert_called('DELETE', '/volumes/5678')
 
     def test_backup(self):

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -33,6 +33,7 @@ MASTER
 ------
 .. _1254951: http://bugs.launchpad.net/python-cinderclient/+bug/1254951
 .. _1254587: http://bugs.launchpad.net/python-cinderclient/+bug/1254587
+.. _1253142: http://bugs.launchpad.net/python-cinderclient/+bug/1253142
 
 1.0.7
 -----