summaryrefslogtreecommitdiff
path: root/tests/test_util.py
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-26 23:59:40 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-26 23:59:40 -0800
commit2615104ce4ba383a46df3c27ba26cfb86654e116 (patch)
treead938e23efd1be67821ddfb710748e746c92c420 /tests/test_util.py
parent28f24e7592fc5a7fd28874e9a350f80674583471 (diff)
parent587fe72fae0efda3a860d37a1ea2449a41dab622 (diff)
downloadpyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.tar.gz
pyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.tar.bz2
pyramid-2615104ce4ba383a46df3c27ba26cfb86654e116.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests/test_util.py')
-rw-r--r--tests/test_util.py32
1 files changed, 3 insertions, 29 deletions
diff --git a/tests/test_util.py b/tests/test_util.py
index 0f313955b..84bc9379f 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -436,37 +436,11 @@ class Test_strings_differ(unittest.TestCase):
self.assertFalse(self._callFUT('123', '123'))
self.assertTrue(self._callFUT('123', '1234'))
- def test_it_with_internal_comparator(self):
- result = self._callFUT(b'foo', b'foo', compare_digest=None)
- self.assertFalse(result)
-
- result = self._callFUT(b'123', b'abc', compare_digest=None)
- self.assertTrue(result)
-
- def test_it_with_external_comparator(self):
- class DummyComparator(object):
- called = False
-
- def __init__(self, ret_val):
- self.ret_val = ret_val
-
- def __call__(self, a, b):
- self.called = True
- return self.ret_val
-
- dummy_compare = DummyComparator(True)
- result = self._callFUT(b'foo', b'foo', compare_digest=dummy_compare)
- self.assertTrue(dummy_compare.called)
+ def test_it(self):
+ result = self._callFUT(b'foo', b'foo')
self.assertFalse(result)
- dummy_compare = DummyComparator(False)
- result = self._callFUT(b'123', b'345', compare_digest=dummy_compare)
- self.assertTrue(dummy_compare.called)
- self.assertTrue(result)
-
- dummy_compare = DummyComparator(False)
- result = self._callFUT(b'abc', b'abc', compare_digest=dummy_compare)
- self.assertTrue(dummy_compare.called)
+ result = self._callFUT(b'123', b'abc')
self.assertTrue(result)