From 6e8328ba5ea45c1d1c9d73bdeb0115f94dae648e Mon Sep 17 00:00:00 2001
From: Juraj Variny <rini17@gmail.com>
Date: Mon, 15 Dec 2014 22:51:08 +0100
Subject: [PATCH] Fix test assertions that slipped when merging
---
repoze/who/plugins/tests/test_authtkt.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/repoze/who/plugins/tests/test_authtkt.py b/repoze/who/plugins/tests/test_authtkt.py
index 9cbf0a1..b01c6c9 100644
--- a/repoze/who/plugins/tests/test_authtkt.py
+++ b/repoze/who/plugins/tests/test_authtkt.py
@@ -100,7 +100,7 @@
self.assertEqual(result['tokens'], [''])
self.assertEqual(result['repoze.who.plugins.auth_tkt.userid'], 'userid')
self.assertEqual(result['userdata'], {'foo': '123'})
- self.failUnless('timestamp' in result)
+ self.assertTrue('timestamp' in result)
self.assertEqual(environ['REMOTE_USER_TOKENS'], [''])
self.assertEqual(environ['REMOTE_USER_DATA'],'foo=123')
self.assertEqual(environ['AUTH_TYPE'],'cookie')
@@ -114,7 +114,7 @@
self.assertEqual(result['tokens'], [''])
self.assertEqual(result['repoze.who.plugins.auth_tkt.userid'], 'userid')
self.assertEqual(result['userdata'], {'foo': '123'})
- self.failUnless('timestamp' in result)
+ self.assertTrue('timestamp' in result)
self.assertEqual(environ['REMOTE_USER_TOKENS'], [''])
self.assertEqual(environ['REMOTE_USER_DATA'],'foo=123')
self.assertEqual(environ['AUTH_TYPE'],'cookie')
@@ -128,7 +128,7 @@
self.assertEqual(result['tokens'], [''])
self.assertEqual(result['repoze.who.plugins.auth_tkt.userid'], 1)
self.assertEqual(result['userdata'], {'userid_type': 'int'})
- self.failUnless('timestamp' in result)
+ self.assertTrue('timestamp' in result)
self.assertEqual(environ['REMOTE_USER_TOKENS'], [''])
self.assertEqual(environ['REMOTE_USER_DATA'],'userid_type=int')
self.assertEqual(environ['AUTH_TYPE'],'cookie')
@@ -142,7 +142,7 @@
self.assertEqual(result['tokens'], [''])
self.assertEqual(result['repoze.who.plugins.auth_tkt.userid'], 'userid')
self.assertEqual(result['userdata'], {'userid_type':'unknown'})
- self.failUnless('timestamp' in result)
+ self.assertTrue('timestamp' in result)
self.assertEqual(environ['REMOTE_USER_TOKENS'], [''])
self.assertEqual(environ['REMOTE_USER_DATA'],'userid_type=unknown')
self.assertEqual(environ['AUTH_TYPE'],'cookie')
@@ -170,7 +170,7 @@
self.assertEqual(result['tokens'], [''])
self.assertEqual(result['repoze.who.plugins.auth_tkt.userid'], 'existing')
self.assertEqual(result['userdata'], {'foo': '123'})
- self.failUnless('timestamp' in result)
+ self.assertTrue('timestamp' in result)
self.assertEqual(environ['REMOTE_USER_TOKENS'], [''])
self.assertEqual(environ['REMOTE_USER_DATA'],'foo=123')
self.assertEqual(environ['AUTH_TYPE'],'cookie')
@@ -181,7 +181,7 @@
environ = self._makeEnviron({'HTTP_COOKIE':'auth_tkt=%s' % val})
result = plugin.remember(environ, {'repoze.who.userid':'userid',
'userdata':{'foo': '123'}})
- self.assertIsNone(result)
+ self.assertEqual(result, None)
def test_remember_creds_secure(self):
plugin = self._makeOne('secret', secure=True)
--
Gitblit v1.9.3