Merge "Remove duplicate test definitions"

This commit is contained in:
Jenkins
2013-05-09 00:17:41 +00:00
committed by Gerrit Code Review
2 changed files with 0 additions and 9 deletions

View File

@@ -78,9 +78,6 @@ class ShellTest(utils.TestCase):
os.environ = _old_env os.environ = _old_env
return out return out
def test_help_unknown_command(self):
self.assertRaises(exceptions.CommandError, shell, 'help foofoo')
def test_help_no_args(self): def test_help_no_args(self):
do_tenant_mock = mock.MagicMock() do_tenant_mock = mock.MagicMock()
with mock.patch('keystoneclient.shell.OpenStackIdentityShell.do_help', with mock.patch('keystoneclient.shell.OpenStackIdentityShell.do_help',

View File

@@ -381,12 +381,6 @@ class FakeHTTPClient(fakes.FakeClient):
"id": "1"}} "id": "1"}}
return (200, body) return (200, body)
def post_OS_KSADM_roles(self, **kw):
body = {"role":
{"name": "new-role",
"id": "1"}}
return (200, body)
def get_OS_KSADM_roles(self, **kw): def get_OS_KSADM_roles(self, **kw):
body = {"roles": [ body = {"roles": [
{"id": "10", "name": "admin"}, {"id": "10", "name": "admin"},