Merge "Run test_mask_password once"

openstack · Aug 10, 2013 · 4829de4 · 4829de4
2 parents 09b74bd + 964b446
commit 4829de4
Showing 1 changed file with 33 additions and 31 deletions.
diff --git a/tests/test_wsgi.py b/tests/test_wsgi.py
@@ -37,37 +37,6 @@ def _make_request(self, url='/'):
         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 @@ def __init__(self, *args, **kwargs):
         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"')