diff options
author | Brant Knudson <bknudson@us.ibm.com> | 2013-08-01 16:51:00 -0500 |
---|---|---|
committer | Brant Knudson <bknudson@us.ibm.com> | 2013-08-01 16:51:00 -0500 |
commit | 964b446493bbd1aa3808f57c868fe03104e79464 (patch) | |
tree | 86944e777ccfde970cfe213f8f14cd0008ce936f | |
parent | 03689503e23a61ebd3642edc7bb3e04b20f26e6e (diff) | |
download | keystone-964b446493bbd1aa3808f57c868fe03104e79464.tar.gz keystone-964b446493bbd1aa3808f57c868fe03104e79464.tar.xz keystone-964b446493bbd1aa3808f57c868fe03104e79464.zip |
Run test_mask_password once
The test_mask_password test doesn't have to run 4 times.
Change-Id: If82e8f22d2594dbdf237e9cbe9eba5b944fb2663
-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"') |