From a5138a32e1962add3d66b2e12aca0ce8b395becd 2012-07-20 23:52:15 From: Takafumi Arakaki Date: 2012-07-20 23:52:15 Subject: [PATCH] Change directory to simplify test_globlist as @bfroehle suggested --- diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py index 2fe844a..e5332a8 100644 --- a/IPython/core/tests/test_magic.py +++ b/IPython/core/tests/test_magic.py @@ -94,27 +94,28 @@ def test_globlist(): filenames = filenames_start_with_a + filenames_end_with_b with TemporaryDirectory() as td: - - def getpaths(names): - return [os.path.join(td, fn) for fn in names] - - # create files - for p in getpaths(filenames): - open(p, 'w').close() - - def assert_match(patterns, matches): - # glob returns unordered list. that's why sorted is required. - nt.assert_equals(sorted(globlist(getpaths(patterns))), - sorted(getpaths(matches))) - - assert_match(['*'], filenames) - assert_match(['a*'], filenames_start_with_a) - assert_match(['*c'], ['*c']) - assert_match(['*', 'a*', '*b', '*c'], - filenames - + filenames_start_with_a - + filenames_end_with_b - + ['*c']) + save = os.getcwdu() + try: + os.chdir(td) + + # Create empty files + for fname in filenames: + open(os.path.join(td, fname), 'w').close() + + def assert_match(patterns, matches): + # glob returns unordered list. that's why sorted is required. + nt.assert_equals(sorted(globlist(patterns)), sorted(matches)) + + assert_match(['*'], filenames) + assert_match(['a*'], filenames_start_with_a) + assert_match(['*c'], ['*c']) + assert_match(['*', 'a*', '*b', '*c'], + filenames + + filenames_start_with_a + + filenames_end_with_b + + ['*c']) + finally: + os.chdir(save) @dec.skip_without('sqlite3')