traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test_logging.py: where needed use unittest's assertGreater, assertLesser, assertIs rather than assertTrue (also in order to debug issue 16264)

This commit is contained in:
Giampaolo Rodola' 2012-10-17 13:24:27 +02:00
parent b4e4c92592
commit 284529dcf4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_logging.py
View File

@ -1450,7 +1450,7 @@ class SocketHandlerTest(BaseTest):
self.root_logger.exception('Never sent') self.root_logger.exception('Never sent')
self.root_logger.error('Never sent, either') self.root_logger.error('Never sent, either')
now = time.time() now = time.time()
self.assertTrue(self.sock_hdlr.retryTime > now) self.assertGreater(self.sock_hdlr.retryTime, now)
time.sleep(self.sock_hdlr.retryTime - now + 0.001) time.sleep(self.sock_hdlr.retryTime - now + 0.001)
self.root_logger.error('Nor this') self.root_logger.error('Nor this')
@ -1776,7 +1776,7 @@ class WarningsTest(BaseTest):
logger.removeHandler(h) logger.removeHandler(h)
s = stream.getvalue() s = stream.getvalue()
h.close() h.close()
self.assertTrue(s.find("UserWarning: I'm warning you...\n") > 0) self.assertGreater(s.find("UserWarning: I'm warning you...\n"), 0)
#See if an explicit file uses the original implementation #See if an explicit file uses the original implementation
a_file = io.StringIO() a_file = io.StringIO()
@ -2801,14 +2801,14 @@ class ChildLoggerTest(BaseTest):
l2 = logging.getLogger('def.ghi') l2 = logging.getLogger('def.ghi')
c1 = r.getChild('xyz') c1 = r.getChild('xyz')
c2 = r.getChild('uvw.xyz') c2 = r.getChild('uvw.xyz')
self.assertTrue(c1 is logging.getLogger('xyz')) self.assertIs(c1, logging.getLogger('xyz'))
self.assertTrue(c2 is logging.getLogger('uvw.xyz')) self.assertIs(c2, logging.getLogger('uvw.xyz'))
c1 = l1.getChild('def') c1 = l1.getChild('def')
c2 = c1.getChild('ghi') c2 = c1.getChild('ghi')
c3 = l1.getChild('def.ghi') c3 = l1.getChild('def.ghi')
self.assertTrue(c1 is logging.getLogger('abc.def')) self.assertIs(c1, logging.getLogger('abc.def'))
self.assertTrue(c2 is logging.getLogger('abc.def.ghi')) self.assertIs(c2, logging.getLogger('abc.def.ghi'))
self.assertTrue(c2 is c3) self.assertIs(c2, c3)
class DerivedLogRecord(logging.LogRecord): class DerivedLogRecord(logging.LogRecord):
@ -3889,7 +3889,7 @@ class NTEventLogHandlerTest(BaseTest):
h.handle(r) h.handle(r)
h.close() h.close()
# Now see if the event is recorded # Now see if the event is recorded
self.assertTrue(num_recs < win32evtlog.GetNumberOfEventLogRecords(elh)) self.assertLess(num_recs, win32evtlog.GetNumberOfEventLogRecords(elh))
flags = win32evtlog.EVENTLOG_BACKWARDS_READ | \ flags = win32evtlog.EVENTLOG_BACKWARDS_READ | \
win32evtlog.EVENTLOG_SEQUENTIAL_READ win32evtlog.EVENTLOG_SEQUENTIAL_READ
found = False found = False