diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-10 02:06:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-10 02:06:45 +0000 |
commit | 4829de4d06dd0056b4e1a5ff9b3c8636d22839bf (patch) | |
tree | a78a1e0660276c96844eceb4d1e0791a81442ffe | |
parent | 09b74bd16023b85da48cea0bf1227f6ad2252cff (diff) | |
parent | 964b446493bbd1aa3808f57c868fe03104e79464 (diff) | |
download | keystone-4829de4d06dd0056b4e1a5ff9b3c8636d22839bf.tar.gz keystone-4829de4d06dd0056b4e1a5ff9b3c8636d22839bf.tar.xz keystone-4829de4d06dd0056b4e1a5ff9b3c8636d22839bf.zip |
Merge "Run test_mask_password once"
-rw-r--r-- | tests/test_wsgi.py | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/tests/test_wsgi.py b/tests/test_wsgi.py index 003f7571..362df922 100644 --- a/tests/test_wsgi.py +++ b/tests/test_wsgi.py @@ -37,37 +37,6 @@ class BaseWSGITest(test.TestCase): req.environ['wsgiorg.routing_args'] = [None, args] return req - def test_mask_password(self): - message = ("test = 'password': 'aaaaaa', 'param1': 'value1', " - "\"new_password\": 'bbbbbb'") - self.assertEqual(wsgi.mask_password(message, True), - u"test = 'password': '***', 'param1': 'value1', " - "\"new_password\": '***'") - - message = "test = 'password' : 'aaaaaa'" - self.assertEqual(wsgi.mask_password(message, False, '111'), - "test = 'password' : '111'") - - message = u"test = u'password' : u'aaaaaa'" - self.assertEqual(wsgi.mask_password(message, True), - u"test = u'password' : u'***'") - - message = 'test = "password" : "aaaaaaaaa"' - self.assertEqual(wsgi.mask_password(message), - 'test = "password" : "***"') - - message = 'test = "original_password" : "aaaaaaaaa"' - self.assertEqual(wsgi.mask_password(message), - 'test = "original_password" : "***"') - - message = 'test = "original_password" : ""' - self.assertEqual(wsgi.mask_password(message), - 'test = "original_password" : "***"') - - message = 'test = "param1" : "value"' - self.assertEqual(wsgi.mask_password(message), - 'test = "param1" : "value"') - class ApplicationTest(BaseWSGITest): def test_response_content_type(self): @@ -210,3 +179,36 @@ class MiddlewareTest(BaseWSGITest): app = factory(self.app) self.assertIn("testkey", app.kwargs) self.assertEquals("test", app.kwargs["testkey"]) + + +class WSGIFunctionTest(test.TestCase): + def test_mask_password(self): + message = ("test = 'password': 'aaaaaa', 'param1': 'value1', " + "\"new_password\": 'bbbbbb'") + self.assertEqual(wsgi.mask_password(message, True), + u"test = 'password': '***', 'param1': 'value1', " + "\"new_password\": '***'") + + message = "test = 'password' : 'aaaaaa'" + self.assertEqual(wsgi.mask_password(message, False, '111'), + "test = 'password' : '111'") + + message = u"test = u'password' : u'aaaaaa'" + self.assertEqual(wsgi.mask_password(message, True), + u"test = u'password' : u'***'") + + message = 'test = "password" : "aaaaaaaaa"' + self.assertEqual(wsgi.mask_password(message), + 'test = "password" : "***"') + + message = 'test = "original_password" : "aaaaaaaaa"' + self.assertEqual(wsgi.mask_password(message), + 'test = "original_password" : "***"') + + message = 'test = "original_password" : ""' + self.assertEqual(wsgi.mask_password(message), + 'test = "original_password" : "***"') + + message = 'test = "param1" : "value"' + self.assertEqual(wsgi.mask_password(message), + 'test = "param1" : "value"') |