Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge

This commit is contained in:
Raymond Hettinger 2011-05-05 14:16:16 -07:00
parent 474ee6c8d0 28338fbdba
commit 7b48432a77
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_logging.py
View File

@ -3494,9 +3494,19 @@ class TimedRotatingFileHandlerTest(BaseFileTest):
earlier = now - datetime.timedelta(seconds=2)
fn1 = self.fn + prevsec.strftime(".%Y-%m-%d_%H-%M-%S")
fn2 = self.fn + earlier.strftime(".%Y-%m-%d_%H-%M-%S")
self.assertTrue(os.path.exists(fn1) or
os.path.exists(fn2),
msg="Neither exists: %s nor %s" % (fn1, fn2))
success = os.path.exists(fn1) or os.path.exists(fn2)
if not success:
# print additional diagnostic information
print('Neither %s nor %s exists' % (fn1, fn2), file=sys.stderr)
dirname = os.path.dirname(fn1)
files = os.listdir(dirname)
files = [f for f in files if f.startswith('test_logging-2-')]
print('matching files: %s' % files, file=sys.stderr)
self.assertTrue(success)
for fn in (fn1, fn2):
if os.path.exists(fn):
self.rmfiles.append(fn)
def test_invalid(self):
assertRaises = self.assertRaises