summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-12-10 11:02:26 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-12-10 11:02:26 (GMT)
commitf29b4937f725681ad1b747ccd629ad022eb8c02e (patch)
tree028700a91e6d0abcac571b9bf5a49abefde7c079 /Lib
parent9d5e0cca85f22e4d1b7357c32103e63c6396f481 (diff)
parentb9e9f3e70d3e5c115d179331ce640b0610c5a243 (diff)
downloadcpython-f29b4937f725681ad1b747ccd629ad022eb8c02e.zip
cpython-f29b4937f725681ad1b747ccd629ad022eb8c02e.tar.gz
cpython-f29b4937f725681ad1b747ccd629ad022eb8c02e.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 92ab0a4..e0ecbf7 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -171,7 +171,7 @@ class TestShutil(unittest.TestCase):
filename = os.path.join(tmpdir, "tstfile")
with self.assertRaises(NotADirectoryError) as cm:
shutil.rmtree(filename)
- if os.name == 'nt':
+ if cm.exception.filename.endswith('*.*'):
rm_name = os.path.join(filename, '*.*')
else:
rm_name = filename