Skip to content

Commit 264ddd5

Browse files
Fix test on Windows.
1 parent ec845a7 commit 264ddd5

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Lib/test/test_glob.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,15 @@ def test_glob_directory_with_trailing_slash(self):
182182
self.assertEqual(glob.glob(self.norm('aaa') + sep*2),
183183
[self.norm('aaa') + sep*2])
184184
# When there is a wildcard pattern which ends with a pathname
185-
# separator, glob() doesn't blow up and preserves the trailing
186-
# separator.
185+
# separator, glob() doesn't blow.
186+
# The result should end with the pathname separator.
187+
# Normalizing the trailing separator is an implementation detail.
187188
eq = self.assertSequencesEqual_noorder
188189
eq(glob.glob(self.norm('aa*') + sep),
189-
[self.norm('aaa') + sep, self.norm('aab') + sep])
190+
[self.norm('aaa') + os.sep, self.norm('aab') + os.sep])
190191
# Stripping the redundant separators is an implementation detail.
191192
eq(glob.glob(self.norm('aa*') + sep*2),
192-
[self.norm('aaa') + sep, self.norm('aab') + sep])
193+
[self.norm('aaa') + os.sep, self.norm('aab') + os.sep])
193194

194195
def test_glob_bytes_directory_with_trailing_slash(self):
195196
# Same as test_glob_directory_with_trailing_slash, but with a
@@ -204,11 +205,11 @@ def test_glob_bytes_directory_with_trailing_slash(self):
204205
[os.fsencode(self.norm('aaa') + sep*2)])
205206
eq = self.assertSequencesEqual_noorder
206207
eq(glob.glob(os.fsencode(self.norm('aa*') + sep)),
207-
[os.fsencode(self.norm('aaa') + sep),
208-
os.fsencode(self.norm('aab') + sep)])
208+
[os.fsencode(self.norm('aaa') + os.sep),
209+
os.fsencode(self.norm('aab') + os.sep)])
209210
eq(glob.glob(os.fsencode(self.norm('aa*') + sep*2)),
210-
[os.fsencode(self.norm('aaa') + sep),
211-
os.fsencode(self.norm('aab') + sep)])
211+
[os.fsencode(self.norm('aaa') + os.sep),
212+
os.fsencode(self.norm('aab') + os.sep)])
212213

213214
@skip_unless_symlink
214215
def test_glob_symlinks(self):

0 commit comments

Comments
 (0)