openstack/python-senlinclient
Code Issues Proposed changes

Merge "Make ignore_missing False when deleting resource"

Browse Source
This commit is contained in:
Jenkins
2016-02-05 02:59:37 +00:00
committed by Gerrit Code Review
parent 2e22adb641 b716257aec
commit 100720d913
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
senlinclient/tests/unit/v1/test_shell.py
View File

@@ -271,9 +271,9 @@ class ShellTest(testtools.TestCase):
args = {'id': ['profile_id']}
args = self._make_args(args)
sh.do_profile_delete(service, args)
service.delete_profile.assert_called_with('profile_id')
service.delete_profile.assert_called_with('profile_id', False)
def test_do_profile_delete_fail(self):
def test_do_profile_delete_not_found(self):
service = mock.Mock()
args = {'id': ['profile1', 'profile2']}
args = self._make_args(args)
@@ -285,7 +285,7 @@ class ShellTest(testtools.TestCase):
service, args)
self.assertEqual(_('Failed to delete some of the specified '
'profile(s).'), six.text_type(ex))
service.delete_profile.assert_called_with('profile2')
service.delete_profile.assert_called_with('profile2', False)
@mock.patch.object(utils, 'print_list')
def test_do_policy_type_list(self, mock_print):
@@ -445,7 +445,7 @@ class ShellTest(testtools.TestCase):
args = self._make_args(args)
service.delete_receiver = mock.Mock()
sh.do_receiver_delete(service, args)
service.delete_receiver.assert_called_once_with('FAKE')
service.delete_receiver.assert_called_once_with('FAKE', False)
def test_do_receiver_delete_not_found(self):
service = mock.Mock()
@@ -573,7 +573,7 @@ class ShellTest(testtools.TestCase):
args = self._make_args(args)
service.delete_policy = mock.Mock()
sh.do_policy_delete(service, args)
service.delete_policy.assert_called_once_with('policy_id')
service.delete_policy.assert_called_once_with('policy_id', False)
def test_do_policy_delete_not_found(self):
service = mock.Mock()
@@ -661,7 +661,7 @@ class ShellTest(testtools.TestCase):
args = self._make_args(args)
service.delete_cluster = mock.Mock()
sh.do_cluster_delete(service, args)
service.delete_cluster.assert_called_once_with('CID')
service.delete_cluster.assert_called_once_with('CID', False)
def test_do_cluster_delete_not_found(self):
service = mock.Mock()
@@ -1126,7 +1126,7 @@ class ShellTest(testtools.TestCase):
sh.do_node_delete(service, args)
service.delete_node.assert_called_once_with('node1', True)
service.delete_node.assert_called_once_with('node1', False)
def test_do_node_delete_not_found(self):
service = mock.Mock()

10
senlinclient/v1/shell.py
View File

@@ -203,7 +203,7 @@ def do_profile_delete(service, args):
for pid in args.id:
try:
service.delete_profile(pid)
service.delete_profile(pid, False)
except Exception as ex:
failure_count += 1
print(ex)
@@ -341,7 +341,7 @@ def do_policy_delete(service, args):
for pid in args.id:
try:
service.delete_policy(pid)
service.delete_policy(pid, False)
except exc.HTTPNotFound as ex:
failure_count += 1
print(ex)
@@ -455,7 +455,7 @@ def do_cluster_delete(service, args):
for cid in args.id:
try:
service.delete_cluster(cid)
service.delete_cluster(cid, False)
except exc.HTTPNotFound as ex:
failure_count += 1
print(ex)
@@ -893,7 +893,7 @@ def do_node_delete(service, args):
for nid in args.id:
try:
service.delete_node(nid, True)
service.delete_node(nid, False)
except exc.HTTPNotFound:
failure_count += 1
print('Node id "%s" not found' % nid)
@@ -1040,7 +1040,7 @@ def do_receiver_delete(service, args):
for wid in args.id:
try:
service.delete_receiver(wid)
service.delete_receiver(wid, False)
except exc.HTTPNotFound as ex:
failure_count += 1
print(ex)