Continue to add/remove the valid hosts or users to the label or ACL in
case of failures.
Modified the corresponding unittests:
. Adding check_playback() everywhere.
. Changing to the new Exception messages.
. New test for partial failure.
Risk: medium
Visibility: medium
Signed-off-by: Jean-Marc Eurin <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2525 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/cli/acl_unittest.py b/cli/acl_unittest.py
index 89ec59e..9f5c9ff 100755
--- a/cli/acl_unittest.py
+++ b/cli/acl_unittest.py
@@ -292,9 +292,40 @@
{'id': 'acl0',
'users': ['user0', 'user1']},
False,
- 'DoesNotExist: User matching query '
- 'does not exist.')],
- err_words_ok=['acl0', 'user0', 'user1'])
+ 'DoesNotExist: The following Users do not exist: '
+ 'user0, user1')],
+ err_words_ok=['user0', 'user1'])
+
+
+ def test_acl_add_bad_users_hosts(self):
+ self.run_cmd(argv=['atest', 'acl', 'add', 'acl0',
+ '-u', 'user0,user1', '-m', 'host0'],
+ rpcs=[('acl_group_add_users',
+ {'id': 'acl0',
+ 'users': ['user0', 'user1']},
+ False,
+ 'DoesNotExist: The following Users do not exist: '
+ 'user0'),
+ ('acl_group_add_users',
+ {'id': 'acl0',
+ 'users': ['user1']},
+ True,
+ None),
+ ('acl_group_add_hosts',
+ {'id': 'acl0',
+ 'hosts': ['host0', 'host1']},
+ False,
+ 'DoesNotExist: The following Hosts do not exist: '
+ 'host1'),
+ ('acl_group_add_hosts',
+ {'id': 'acl0',
+ 'hosts': ['host0']},
+ True,
+ None)],
+ out_words_ok=['acl0', 'user1', 'host0'],
+ out_words_no=['user0', 'host1'],
+ err_words_ok=['user0', 'host1'],
+ err_words_no=['user1', 'host0'])
class acl_remove_unittest(cli_mock.cli_unittest):
