summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-12-16 11:39:11 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-12-16 11:39:11 (GMT)
commitdec59ec5ff9f48d1fe9bf8f5ff3874ef9f0f54ad (patch)
treebdf7fbb906dc477ee437f96831e9eff3e9c9d1f8
parent7eb8a1a0cb0b1b84bd9748e1e584f143c70b9e97 (diff)
downloadcpython-dec59ec5ff9f48d1fe9bf8f5ff3874ef9f0f54ad.zip
cpython-dec59ec5ff9f48d1fe9bf8f5ff3874ef9f0f54ad.tar.gz
cpython-dec59ec5ff9f48d1fe9bf8f5ff3874ef9f0f54ad.tar.bz2
#16664: Add regression tests for glob's behaviour concerning "."-entries
Patch by Sebastian Kreft.
-rw-r--r--Lib/test/test_glob.py7
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
index 1560a6b..711369e 100644
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -4,6 +4,7 @@ import glob
import os
import shutil
+
class GlobTests(unittest.TestCase):
def norm(self, *parts):
@@ -18,9 +19,11 @@ class GlobTests(unittest.TestCase):
f.close()
def setUp(self):
- self.tempdir = TESTFN+"_dir"
+ self.tempdir = TESTFN + "_dir"
self.mktemp('a', 'D')
self.mktemp('aab', 'F')
+ self.mktemp('.aa', 'G')
+ self.mktemp('.bb', 'H')
self.mktemp('aaa', 'zzzF')
self.mktemp('ZZZ')
self.mktemp('a', 'bcd', 'EF')
@@ -66,6 +69,8 @@ class GlobTests(unittest.TestCase):
eq = self.assertSequencesEqual_noorder
eq(self.glob('a*'), map(self.norm, ['a', 'aab', 'aaa']))
eq(self.glob('*a'), map(self.norm, ['a', 'aaa']))
+ eq(self.glob('.*'), map(self.norm, ['.aa', '.bb']))
+ eq(self.glob('?aa'), map(self.norm, ['aaa']))
eq(self.glob('aa?'), map(self.norm, ['aaa', 'aab']))
eq(self.glob('aa[ab]'), map(self.norm, ['aaa', 'aab']))
eq(self.glob('*q'), [])
diff --git a/Misc/ACKS b/Misc/ACKS
index 424e72a..81af9fd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -587,6 +587,7 @@ Jerzy Kozera
Maksim Kozyarchuk
Stefan Krah
Bob Kras
+Sebastian Kreft
Holger Krekel
Michael Kremer
Fabian Kreutz
diff --git a/Misc/NEWS b/Misc/NEWS
index 57cab2d..c5288f7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -689,6 +689,9 @@ Extension Modules
Tests
-----
+- Issue #16664: Add regression tests for glob's behaviour concerning entries
+ starting with a ".". Patch by Sebastian Kreft.
+
- Issue #15872: Add tests for a 3.3 regression which caused the new fd-based
shutil.rmtree not ignore all errors. Also add a test ensuring that rmtree
fails when being called on a symlink. Patch by Serhiy Storchaka.