[Python-checkins] cpython (merge 3.3 -> default): #15872: Be flexible with appending *.* in shutil.rmtree test case

[hynek.schlawack]

http://hg.python.org/cpython/rev/a0a25ffdec9d
changeset:   80811:a0a25ffdec9d
parent:      80808:c23659e2ec1a
parent:      80810:edb747c6c479
user:        Hynek Schlawack <hs at ox.cx>
date:        Mon Dec 10 12:05:45 2012 +0100
summary:
  #15872: Be flexible with appending *.* in shutil.rmtree test case

The Windows buildbots seem to be unable to agree whether they need them or not.

files:
  Lib/test/test_shutil.py |  10 +++++++---
  1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -172,7 +172,11 @@
         filename = os.path.join(tmpdir, "tstfile")
         with self.assertRaises(NotADirectoryError) as cm:
             shutil.rmtree(filename)
-        self.assertEqual(cm.exception.filename, filename)
+        if cm.exception.filename.endswith('*.*'):
+            rm_name = os.path.join(filename, '*.*')
+        else:
+            rm_name = filename
+        self.assertEqual(cm.exception.filename, rm_name)
         self.assertTrue(os.path.exists(filename))
         # test that ignore_errors option is honored
         shutil.rmtree(filename, ignore_errors=True)
@@ -185,11 +189,11 @@
         self.assertIs(errors[0][0], os.listdir)
         self.assertEqual(errors[0][1], filename)
         self.assertIsInstance(errors[0][2][1], NotADirectoryError)
-        self.assertEqual(errors[0][2][1].filename, filename)
+        self.assertEqual(errors[0][2][1].filename, rm_name)
         self.assertIs(errors[1][0], os.rmdir)
         self.assertEqual(errors[1][1], filename)
         self.assertIsInstance(errors[1][2][1], NotADirectoryError)
-        self.assertEqual(errors[1][2][1].filename, filename)
+        self.assertEqual(errors[1][2][1].filename, rm_name)
 
     # See bug #1071513 for why we don't run this on cygwin
     # and bug #1076467 for why we don't run this as root.

-- 
Repository URL: http://hg.python.org/cpython