Improve tests.

zopefoundation · Apr 23, 2018 · 569dfd2 · 569dfd2
1 parent 4ea1528
commit 569dfd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/OFS/tests/testProperties.py b/src/OFS/tests/testProperties.py
@@ -99,8 +99,7 @@ def test_updateProperty_transforms(self):
         self.assertEqual(pm.getProperty('test_lines'), (b'bar', b'baz'))
 
         pm._updateProperty('test_lines', six.u('uni\ncode'))
-        self.assertEqual(pm.getProperty('test_lines'), 
-                         (six.b('uni'), six.b('code')))
+        self.assertEqual(pm.getProperty('test_lines'), (b'uni', b'code'))
 
 
 class TestPropertySheet(unittest.TestCase):
@@ -137,7 +136,4 @@ def test_updateProperty_transforms(self):
         self.assertEqual(ps.getProperty('test_lines'), (b'bar', b'baz'))
 
         ps._updateProperty('test_lines', six.u('uni\ncode'))
-        self.assertEqual(ps.getProperty('test_lines'), 
-                         (six.b('uni'), six.b('code')))
-
-
+        self.assertEqual(ps.getProperty('test_lines'), (b'uni', b'code'))
diff --git a/src/ZPublisher/tests/testHTTPRequest.py b/src/ZPublisher/tests/testHTTPRequest.py
@@ -184,7 +184,7 @@ def _valueIsOrHoldsTainted(self, val):
 
         elif type(val) in (str, unicode):
             self.assertFalse(
-                '<' in val,
+                should_be_tainted(val),
                 "'%s' is dangerous and should have been tainted." % val)
 
         return retval