[Jython-checkins] jython: Protect test_glob from occasional failure on Windows.

jeff.allen jython-checkins at python.org
Fri Oct 30 17:07:27 EDT 2015


https://hg.python.org/jython/rev/60c5479cd11f
changeset:   7783:60c5479cd11f
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Fri Oct 30 19:59:32 2015 +0000
summary:
  Protect test_glob from occasional failure on Windows.

Another unlink() that occasionally fails.

files:
  Lib/test/test_glob.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -3,6 +3,7 @@
 import shutil
 import sys
 import unittest
+import warnings
 
 from test.test_support import run_unittest, TESTFN
 
@@ -40,7 +41,10 @@
             os.symlink(os.path.join('a', 'bcd'), self.norm('sym3'))
 
     def tearDown(self):
-        shutil.rmtree(self.tempdir)
+        try:
+            shutil.rmtree(self.tempdir)
+        except OSError:
+            warnings.warn("Failed to remove " + self.tempdir)
 
     def glob(self, *parts):
         if len(parts) == 1:

-- 
Repository URL: https://hg.python.org/jython


More information about the Jython-checkins mailing list