From d7b67c7399b1b2d1e394d92889f7bd8a4f1436aa Mon Sep 17 00:00:00 2001 From: Jim Fulton <jim@zope.com> Date: Mon, 11 Apr 2011 21:01:44 +0000 Subject: [PATCH] merged ZODB/branches/tseaver-squelch_2.6_warnings to avoid a warning while running tests. --- src/BTrees/tests/test_compare.py | 15 +++++++++++++-- src/ZEO/tests/zeoserver.py | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/BTrees/tests/test_compare.py b/src/BTrees/tests/test_compare.py index 6381ddb3..a72f0ae0 100644 --- a/src/BTrees/tests/test_compare.py +++ b/src/BTrees/tests/test_compare.py @@ -47,8 +47,19 @@ class CompareTest(unittest.TestCase): self.assertRaises(UnicodeError, callable, *args) def testBucketGet(self): - self.bucket[self.s] = 1 - self.assertUE(self.bucket.get, self.u) + import sys + import warnings + _warnlog = [] + def _showwarning(*args, **kw): + _warnlog.append((args, kw)) + warnings.showwarning, _before = _showwarning, warnings.showwarning + try: + self.bucket[self.s] = 1 + self.assertUE(self.bucket.get, self.u) + finally: + warnings.showwarning = _before + if sys.version_info >= (2, 6): + self.assertEqual(len(_warnlog), 1) def testSetGet(self): self.set.insert(self.s) diff --git a/src/ZEO/tests/zeoserver.py b/src/ZEO/tests/zeoserver.py index 08d3b421..c5861d54 100644 --- a/src/ZEO/tests/zeoserver.py +++ b/src/ZEO/tests/zeoserver.py @@ -210,4 +210,6 @@ def main(): if __name__ == '__main__': + import warnings + warnings.simplefilter('ignore') main() -- 2.30.9