Merge branch 'master' into move-acl-security-to-authorization

3 files changed, 5 insertions, 5 deletions

diff --git a/tests/pkgs/securityapp/__init__.py b/tests/pkgs/securityapp/__init__.py
index 6c9025e7d..facc37878 100644
--- a/tests/pkgs/securityapp/__init__.py
+++ b/tests/pkgs/securityapp/__init__.py
@@ -3,7 +3,7 @@ from pyramid.security import Allowed, Denied
 
 
 class SecurityPolicy:
-    def identify(self, request):
+    def authenticated_identity(self, request):
         raise NotImplementedError()  # pragma: no cover
 
     def authenticated_userid(self, request):
diff --git a/tests/test_security.py b/tests/test_security.py
index fa3d165ea..db5861562 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -479,7 +479,7 @@ class TestLegacySecurityPolicy(unittest.TestCase):
         policy = LegacySecurityPolicy()
         _registerAuthenticationPolicy(request.registry, 'userid')
 
-        self.assertEqual(policy.identify(request), 'userid')
+        self.assertEqual(policy.authenticated_identity(request), 'userid')
 
     def test_remember(self):
         from pyramid.security import LegacySecurityPolicy
@@ -532,7 +532,7 @@ class DummySecurityPolicy:
     def __init__(self, result):
         self.result = result
 
-    def identify(self, request):
+    def authenticated_identity(self, request):
         return self.result
 
     def authenticated_userid(self, request):
diff --git a/tests/test_testing.py b/tests/test_testing.py
index a5746b59d..dbda76454 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -27,9 +27,9 @@ class TestDummySecurityPolicy(unittest.TestCase):
         klass = self._getTargetClass()
         return klass(userid, identity, permissive)
 
-    def test_identify(self):
+    def test_authenticated_identity(self):
         policy = self._makeOne('user', 'identity')
-        self.assertEqual(policy.identify(None), 'identity')
+        self.assertEqual(policy.authenticated_identity(None), 'identity')
 
     def test_authenticated_userid(self):
         policy = self._makeOne('user')