From 6e4d7ee145989879a7c24f2c9ad43d4d54b7fde7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 19 May 2014 23:54:03 +0300 Subject: [PATCH] glob: Patch test_glob.py a bit. bytes/str dichotomy and win32-specifics. --- glob/test_glob.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/glob/test_glob.py b/glob/test_glob.py index eb9aeb57..98b053e1 100644 --- a/glob/test_glob.py +++ b/glob/test_glob.py @@ -1,5 +1,6 @@ import glob import os +import os.path import shutil import sys import unittest @@ -69,10 +70,10 @@ class GlobTests(unittest.TestCase): res = glob.glob(os.path.join(os.curdir, '*')) self.assertEqual({type(r) for r in res}, {str}) - res = glob.glob(b'*') - self.assertEqual({type(r) for r in res}, {bytes}) - res = glob.glob(os.path.join(os.fsencode(os.curdir), b'*')) - self.assertEqual({type(r) for r in res}, {bytes}) +# res = glob.glob(b'*') +# self.assertEqual({type(r) for r in res}, {bytes}) +# res = glob.glob(os.path.join(os.fsencode(os.curdir), b'*')) +# self.assertEqual({type(r) for r in res}, {bytes}) def test_glob_one_directory(self): eq = self.assertSequencesEqual_noorder @@ -157,8 +158,8 @@ class GlobTests(unittest.TestCase): eq(self.glob('sym1'), [self.norm('sym1')]) eq(self.glob('sym2'), [self.norm('sym2')]) - @unittest.skipUnless(sys.platform == "win32", "Win32 specific test") - def test_glob_magic_in_drive(self): +# @unittest.skipUnless(sys.platform == "win32", "Win32 specific test") + def _test_glob_magic_in_drive(self): eq = self.assertSequencesEqual_noorder eq(glob.glob('*:'), []) eq(glob.glob(b'*:'), [])