summaryrefslogtreecommitdiff
path: root/keystone/tests/test_v3_identity.py
diff options
context:
space:
mode:
Diffstat (limited to 'keystone/tests/test_v3_identity.py')
-rw-r--r--keystone/tests/test_v3_identity.py18
1 files changed, 4 insertions, 14 deletions
diff --git a/keystone/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py
index dfcffda9d..36f8f9db5 100644
--- a/keystone/tests/test_v3_identity.py
+++ b/keystone/tests/test_v3_identity.py
@@ -1662,8 +1662,6 @@ class IdentityTestCase(test_v3.RestfulTestCase):
def test_create_user_password_not_logged(self):
# When a user is created, the password isn't logged at any level.
- # FIXME(blk-u): This doesn't work as expected, see bug 1465922
-
log_fix = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
ref = self.new_user_ref(domain_id=self.domain_id)
@@ -1671,15 +1669,12 @@ class IdentityTestCase(test_v3.RestfulTestCase):
'/users',
body={'user': ref})
- # This should be assert*Not*In, see bug 1465922
- self.assertIn(ref['password'], log_fix.output)
+ self.assertNotIn(ref['password'], log_fix.output)
def test_update_password_not_logged(self):
# When admin modifies user password, the password isn't logged at any
# level.
- # FIXME(blk-u): This doesn't work as expected, see bug 1465922
-
log_fix = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
# bootstrap a user as admin
@@ -1694,9 +1689,7 @@ class IdentityTestCase(test_v3.RestfulTestCase):
expected_status=200)
self.assertNotIn(password, log_fix.output)
-
- # This should be assert*Not*In, see bug 1465922
- self.assertIn(new_password, log_fix.output)
+ self.assertNotIn(new_password, log_fix.output)
class IdentityInheritanceTestCase(test_v3.RestfulTestCase):
@@ -2346,8 +2339,6 @@ class UserSelfServiceChangingPasswordsTestCase(test_v3.RestfulTestCase):
# When a user changes their password, the password isn't logged at any
# level.
- # FIXME(blk-u): This doesn't work as expected, see bug 1465922
-
log_fix = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
# change password
@@ -2356,6 +2347,5 @@ class UserSelfServiceChangingPasswordsTestCase(test_v3.RestfulTestCase):
original_password=self.user_ref['password'],
expected_status=204)
- # These should be assert*Not*In, see bug 1465922
- self.assertIn(self.user_ref['password'], log_fix.output)
- self.assertIn(new_password, log_fix.output)
+ self.assertNotIn(self.user_ref['password'], log_fix.output)
+ self.assertNotIn(new_password, log_fix.output)