summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-12-10 11:01:28 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-12-10 11:01:28 (GMT)
commitb9e9f3e70d3e5c115d179331ce640b0610c5a243 (patch)
treea324283e33025f6f1c78bc1a3651718feca77cd1 /Lib
parent9a4a750673ca6d93c635a32d84b2cf94ebc4931c (diff)
downloadcpython-b9e9f3e70d3e5c115d179331ce640b0610c5a243.zip
cpython-b9e9f3e70d3e5c115d179331ce640b0610c5a243.tar.gz
cpython-b9e9f3e70d3e5c115d179331ce640b0610c5a243.tar.bz2
#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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_shutil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 1eb5e89..9509d2a 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -132,7 +132,7 @@ class TestShutil(unittest.TestCase):
filename = os.path.join(tmpdir, "tstfile")
with self.assertRaises(OSError) as cm:
shutil.rmtree(filename)
- if os.name == 'nt':
+ if cm.exception.filename.endswith('*.*'):
rm_name = os.path.join(filename, '*.*')
else:
rm_name = filename