From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 13 May 2011 13:45:08 +0000 (+0100)
Subject: test_logging: fixed bug in failure diagnostics.
X-Git-Tag: v3.3.0a1~2288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a171f9c6a3c8cdf8ab25b0e0b1e4359d97b7fb85;p=thirdparty%2FPython%2Fcpython.git

test_logging: fixed bug in failure diagnostics.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 505ce6e3b66d..f215834c6289 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3526,8 +3526,8 @@ class TimedRotatingFileHandlerTest(BaseFileTest):
         msg = 'No rotated files found, went back %d seconds' % GO_BACK
         if not found:
             #print additional diagnostics
-            dn = os.path.dirname(self.fn)
-            files = [f for f in os.listdir(dn) if f.startswith(self.fn)]
+            dn, fn = os.path.split(self.fn)
+            files = [f for f in os.listdir(dn) if f.startswith(fn)]
             print('Test time: %s' % now.strftime("%Y-%m-%d %H-%M-%S"))
             print('The only matching files are: %s' % files)
         self.assertTrue(found, msg=msg)