Update Keystone core to Mitaka.

Change-Id: Ia10d6add16f4a9d25d1f42d420661c46332e69db

1 files changed, 12 insertions, 17 deletions

diff --git a/keystone-moon/keystone/tests/unit/test_v3_policy.py b/keystone-moon/keystone/tests/unit/test_v3_policy.py
index 538fc565..76a52088 100644
--- a/keystone-moon/keystone/tests/unit/test_v3_policy.py
+++ b/keystone-moon/keystone/tests/unit/test_v3_policy.py
@@ -12,8 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 import uuid
 
+from keystone.tests import unit
 from keystone.tests.unit import test_v3
 
 
@@ -22,9 +24,8 @@ class PolicyTestCase(test_v3.RestfulTestCase):
 
     def setUp(self):
         super(PolicyTestCase, self).setUp()
-        self.policy_id = uuid.uuid4().hex
-        self.policy = self.new_policy_ref()
-        self.policy['id'] = self.policy_id
+        self.policy = unit.new_policy_ref()
+        self.policy_id = self.policy['id']
         self.policy_api.create_policy(
             self.policy_id,
             self.policy.copy())
@@ -33,10 +34,8 @@ class PolicyTestCase(test_v3.RestfulTestCase):
 
     def test_create_policy(self):
         """Call ``POST /policies``."""
-        ref = self.new_policy_ref()
-        r = self.post(
-            '/policies',
-            body={'policy': ref})
+        ref = unit.new_policy_ref()
+        r = self.post('/policies', body={'policy': ref})
         return self.assertValidPolicyResponse(r, ref)
 
     def test_list_policies(self):
@@ -47,22 +46,18 @@ class PolicyTestCase(test_v3.RestfulTestCase):
     def test_get_policy(self):
         """Call ``GET /policies/{policy_id}``."""
         r = self.get(
-            '/policies/%(policy_id)s' % {
-                'policy_id': self.policy_id})
+            '/policies/%(policy_id)s' % {'policy_id': self.policy_id})
         self.assertValidPolicyResponse(r, self.policy)
 
     def test_update_policy(self):
         """Call ``PATCH /policies/{policy_id}``."""
-        policy = self.new_policy_ref()
-        policy['id'] = self.policy_id
+        self.policy['blob'] = json.dumps({'data': uuid.uuid4().hex, })
         r = self.patch(
-            '/policies/%(policy_id)s' % {
-                'policy_id': self.policy_id},
-            body={'policy': policy})
-        self.assertValidPolicyResponse(r, policy)
+            '/policies/%(policy_id)s' % {'policy_id': self.policy_id},
+            body={'policy': self.policy})
+        self.assertValidPolicyResponse(r, self.policy)
 
     def test_delete_policy(self):
         """Call ``DELETE /policies/{policy_id}``."""
         self.delete(
-            '/policies/%(policy_id)s' % {
-                'policy_id': self.policy_id})
+            '/policies/%(policy_id)s' % {'policy_id': self.policy_id})