[Python-checkins] cpython (merge 3.3 -> default): #15872: More shutil test fixes for Windows

[hynek.schlawack]

http://hg.python.org/cpython/rev/c23659e2ec1a
changeset:   80808:c23659e2ec1a
parent:      80805:ad1c1164f68b
parent:      80807:a05e2d4094ea
user:        Hynek Schlawack <hs at ox.cx>
date:        Mon Dec 10 11:12:57 2012 +0100
summary:
  #15872: More shutil test fixes for Windows

This one is different from 3.2 and 3.3.  Windows ceased using *.* since 3.4
apparently.

files:
  Lib/test/test_shutil.py |  6 +-----
  1 files changed, 1 insertions(+), 5 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,11 +172,7 @@
         filename = os.path.join(tmpdir, "tstfile")
         with self.assertRaises(NotADirectoryError) as cm:
             shutil.rmtree(filename)
-        if os.name == 'nt':
-            rm_name = os.path.join(filename, '*.*')
-        else:
-            rm_name = filename
-        self.assertEqual(cm.exception.filename, rm_name)
+        self.assertEqual(cm.exception.filename, filename)
         self.assertTrue(os.path.exists(filename))
         # test that ignore_errors option is honored
         shutil.rmtree(filename, ignore_errors=True)

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