Merge lp:~zulcss/keystone/keystoneclient-refresh into lp:~ubuntu-server-dev/keystone/icehouse

[Chuck Short]

Refreshed patch

[Andres Rodriguez (andreserl)]

lgtm

review: Approve

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2013-12-06 16:57:38 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2013-12-16 15:13:19 +0000
@@ -2,7 +2,7 @@
 Author: Chuck Short <[e-mail]>
 Forwarded: not-needed
 diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
-index fb8027e..3e532f1 100644
+index c34c5bf..57092cb 100644
 --- a/keystone/tests/test_keystoneclient.py
 +++ b/keystone/tests/test_keystoneclient.py
 @@ -55,13 +55,13 @@ class CompatTestCase(tests.NoModule, tests.TestCase):
@@ -16,132 +16,14 @@
 -            revdir = tests.checkout_vendor(*checkout_info)
 -        self.add_path(revdir)
 -        self.clear_module('keystoneclient')
-+#        checkout_info = self.get_checkout()
-+#        if isinstance(checkout_info, str):
-+#            revdir = checkout_info
-+#        else:
-+#            revdir = tests.checkout_vendor(*checkout_info)
-+#        self.add_path(revdir)
-+#        self.clear_module('keystoneclient')
++        #checkout_info = self.get_checkout()
++        #if isinstance(checkout_info, str):
++        #    revdir = checkout_info
++        #else:
++        #    revdir = tests.checkout_vendor(*checkout_info)
++        #self.add_path(revdir)
++        #self.clear_module('keystoneclient')
  
      def _public_url(self):
          public_port = self.public_server.socket_info['socket'][1]
-@@ -1085,115 +1085,3 @@ class KcOptTestCase(KcMasterTestCase):
- 
-     def get_checkout(self):
-         return self.path
--
--
--class KcEssex3TestCase(CompatTestCase, KeystoneClientTests):
--    def get_checkout(self):
--        return KEYSTONECLIENT_REPO, 'essex-3'
--
--    def test_tenant_add_and_remove_user(self):
--        client = self.get_client(admin=True)
--        client.roles.add_user_to_tenant(tenant_id=self.tenant_bar['id'],
--                                        user_id=self.user_two['id'],
--                                        role_id=self.role_member['id'])
--        role_refs = client.roles.get_user_role_refs(
--            user_id=self.user_two['id'])
--        self.assertTrue(self.tenant_baz['id'] in
--                        [x.tenantId for x in role_refs])
--
--        # get the "role_refs" so we get the proper id, this is how the clients
--        # do it
--        roleref_refs = client.roles.get_user_role_refs(
--            user_id=self.user_two['id'])
--        for roleref_ref in roleref_refs:
--            if (roleref_ref.roleId == self.role_member['id']
--                    and roleref_ref.tenantId == self.tenant_baz['id']):
--                # use python's scope fall through to leave roleref_ref set
--                break
--
--        client.roles.remove_user_from_tenant(tenant_id=self.tenant_bar['id'],
--                                             user_id=self.user_two['id'],
--                                             role_id=roleref_ref.id)
--
--        role_refs = client.roles.get_user_role_refs(
--            user_id=self.user_two['id'])
--        self.assertTrue(self.tenant_baz['id'] not in
--                        [x.tenantId for x in role_refs])
--
--    def test_roles_get_by_user(self):
--        client = self.get_client(admin=True)
--        roles = client.roles.get_user_role_refs(user_id='foo')
--        self.assertTrue(len(roles) > 0)
--
--    def test_role_list_404(self):
--        self.skipTest('N/A')
--
--    def test_authenticate_and_delete_token(self):
--        self.skipTest('N/A')
--
--    def test_user_create_update_delete(self):
--        from keystoneclient import exceptions as client_exceptions
--
--        test_username = 'new_user'
--        client = self.get_client(admin=True)
--        user = client.users.create(name=test_username,
--                                   password='password',
--                                   email='[e-mail]')
--        self.assertEqual(user.name, test_username)
--
--        user = client.users.get(user=user.id)
--        self.assertEqual(user.name, test_username)
--
--        user = client.users.update_email(user=user, email='[e-mail]')
--        self.assertEqual(user.email, '[e-mail]')
--
--        # NOTE(termie): update_enabled doesn't return anything, probably a bug
--        client.users.update_enabled(user=user, enabled=False)
--        user = client.users.get(user.id)
--        self.assertFalse(user.enabled)
--
--        self.assertRaises(client_exceptions.Unauthorized,
--                          self._client,
--                          username=test_username,
--                          password='password')
--        client.users.update_enabled(user, True)
--
--        user = client.users.update_password(user=user, password='password2')
--
--        self._client(username=test_username,
--                     password='password2')
--
--        user = client.users.update_tenant(user=user, tenant='bar')
--        # TODO(ja): once keystonelight supports default tenant
--        #           when you login without specifying tenant, the
--        #           token should be scoped to tenant 'bar'
--
--        client.users.delete(user.id)
--        self.assertRaises(client_exceptions.NotFound, client.users.get,
--                          user.id)
--
--    def test_user_update_404(self):
--        self.skipTest('N/A')
--
--    def test_endpoint_create_404(self):
--        self.skipTest('N/A')
--
--    def test_endpoint_delete_404(self):
--        self.skipTest('N/A')
--
--    def test_policy_crud(self):
--        self.skipTest('N/A due to lack of endpoint CRUD')
--
--    def test_disable_tenant_invalidates_token(self):
--        self.skipTest('N/A')
--
--    def test_delete_tenant_invalidates_token(self):
--        self.skipTest('N/A')
--
--
--class Kc11TestCase(CompatTestCase, KeystoneClientTests):
--    def get_checkout(self):
--        return KEYSTONECLIENT_REPO, '0.1.1'
--
--    def test_policy_crud(self):
--        self.skipTest('N/A')
--- 
-1.8.5.1