[Python-checkins] cpython: Issue #13968: Fixed newly added recursive glob test.

Thu Sep 11 14:34:48 CEST 2014

http://hg.python.org/cpython/rev/180f5bf7d1b9
changeset: 92404:180f5bf7d1b9
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Sep 11 14:33:02 2014 +0300
summary:
 Issue #13968: Fixed newly added recursive glob test.
It was failed when run with non-empty current directory.
files:
 Lib/test/test_glob.py | 72 +++++++++++++++---------------
 1 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -5,7 +5,7 @@
 import unittest
 
 from test.support import (TESTFN, skip_unless_symlink,
- can_symlink, create_empty_file)
+ can_symlink, create_empty_file, change_cwd)
 
 
 class GlobTests(unittest.TestCase):
@@ -266,44 +266,46 @@
 def test_selflink(self):
 tempdir = TESTFN + "_dir"
 os.makedirs(tempdir)
- create_empty_file(os.path.join(tempdir, 'file'))
- os.symlink(os.curdir, os.path.join(tempdir, 'link'))
 self.addCleanup(shutil.rmtree, tempdir)
+ with change_cwd(tempdir):
+ os.makedirs('dir')
+ create_empty_file(os.path.join('dir', 'file'))
+ os.symlink(os.curdir, os.path.join('dir', 'link'))
 
- results = glob.glob('**', recursive=True)
- self.assertEqual(len(results), len(set(results)))
- results = set(results)
- depth = 0
- while results:
- path = os.path.join(*([tempdir] + ['link'] * depth))
- self.assertIn(path, results)
- results.remove(path)
- if not results:
- break
- path = os.path.join(path, 'file')
- self.assertIn(path, results)
- results.remove(path)
- depth += 1
+ results = glob.glob('**', recursive=True)
+ self.assertEqual(len(results), len(set(results)))
+ results = set(results)
+ depth = 0
+ while results:
+ path = os.path.join(*(['dir'] + ['link'] * depth))
+ self.assertIn(path, results)
+ results.remove(path)
+ if not results:
+ break
+ path = os.path.join(path, 'file')
+ self.assertIn(path, results)
+ results.remove(path)
+ depth += 1
 
- results = glob.glob(os.path.join('**', 'file'), recursive=True)
- self.assertEqual(len(results), len(set(results)))
- results = set(results)
- depth = 0
- while results:
- path = os.path.join(*([tempdir] + ['link'] * depth + ['file']))
- self.assertIn(path, results)
- results.remove(path)
- depth += 1
+ results = glob.glob(os.path.join('**', 'file'), recursive=True)
+ self.assertEqual(len(results), len(set(results)))
+ results = set(results)
+ depth = 0
+ while results:
+ path = os.path.join(*(['dir'] + ['link'] * depth + ['file']))
+ self.assertIn(path, results)
+ results.remove(path)
+ depth += 1
 
- results = glob.glob(os.path.join('**', ''), recursive=True)
- self.assertEqual(len(results), len(set(results)))
- results = set(results)
- depth = 0
- while results:
- path = os.path.join(*([tempdir] + ['link'] * depth + ['']))
- self.assertIn(path, results)
- results.remove(path)
- depth += 1
+ results = glob.glob(os.path.join('**', ''), recursive=True)
+ self.assertEqual(len(results), len(set(results)))
+ results = set(results)
+ depth = 0
+ while results:
+ path = os.path.join(*(['dir'] + ['link'] * depth + ['']))
+ self.assertIn(path, results)
+ results.remove(path)
+ depth += 1
 
 
 if __name__ == "__main__":
-- 
Repository URL: http://hg.python.org/cpython
