Convert PythonTests to use directory fixture

1 files changed, 1 insertions, 79 deletions

diff --git a/src/engine/SCons/Scanner/PythonTests.py b/src/engine/SCons/Scanner/PythonTests.py
index 48f6cfc..0d4e628 100644
--- a/src/engine/SCons/Scanner/PythonTests.py
+++ b/src/engine/SCons/Scanner/PythonTests.py
@@ -35,85 +35,7 @@ import SCons.Node.FS
 import SCons.Scanner.Python
 
 test = TestCmd.TestCmd(workdir='')
-
-# This directory is a simple empty package.
-test.subdir('simple_package')
-test.write(['simple_package', '__init__.py'], '')
-test.write(['simple_package', 'module1.py'], '')
-test.write(['simple_package', 'module2.py'], '')
-
-# Two files that import from simple_package.
-test.write('imports_simple_package.py', r"""
-import simple_package
-""")
-test.write('import_simple_package_module1.py', r"""
-import simple_package.module1
-""")
-test.write('import_simple_package_module1_as.py', r"""
-import simple_package.module1 as m1
-""")
-test.write('from_import_simple_package_module1.py', r"""
-from simple_package import module1
-""")
-test.write('from_import_simple_package_module1_as.py', r"""
-from simple_package import module1 as m1
-""")
-test.write('from_import_simple_package_modules_no_space.py', r"""
-from simple_package import module1,module2
-""")
-test.write('from_import_simple_package_modules_with_space.py', r"""
-from simple_package import module1, module2
-""")
-
-# This directory holds a script that imports another from the current dir.
-test.subdir('curdir_reference')
-test.write(['curdir_reference', 'script.py'], r"""
-from . import helper
-""")
-test.write(['curdir_reference', 'helper.py'], r'')
-
-# Create the directory structure:
-#   imports_nested3.py
-#   nested1
-#    |- __init__.py
-#    |- module.py
-#    |- nested2
-#    |  |- __init__.py
-#    |  |- module.py
-#    |  '- nested3
-#    |     |- __init__.py
-#    |     |- imports_grandparent_module.py
-#    |     |- imports_parent_module.py
-#    |     |- imports_parent_then_submodule.py
-#    |     '- module.py
-#    '- nested2a
-#       |- __init__.py
-#       '- module.py
-# This is used for more advanced relative path test cases.
-test.write('imports_nested3.py', r"""
-import nested1.nested2.nested3
-""")
-test.subdir('nested1', ['nested1', 'nested2'], ['nested1', 'nested2a'],
-            ['nested1', 'nested2', 'nested3'])
-test.write(['nested1', '__init__.py'], r'')
-test.write(['nested1', 'module.py'], r'')
-test.write(['nested1', 'nested2', '__init__.py'], r'')
-test.write(['nested1', 'nested2', 'module.py'], r'')
-test.write(['nested1', 'nested2a', '__init__.py'], r'')
-test.write(['nested1', 'nested2a', 'module.py'], r'')
-test.write(['nested1', 'nested2', 'nested3', '__init__.py'], r'')
-test.write(['nested1', 'nested2', 'nested3',
-            'imports_grandparent_module.py'], r"""
-from ... import module
-""")
-test.write(['nested1', 'nested2', 'nested3', 'imports_parent_module.py'], r"""
-from .. import module
-""")
-test.write(['nested1', 'nested2', 'nested3',
-            'imports_parent_then_submodule.py'], r"""
-from ...nested2a import module
-""")
-test.write(['nested1', 'nested2', 'nested3', 'module.py'], r'')
+test.dir_fixture('python_scanner')
 
 if os.path.normcase('foo') == os.path.normcase('FOO'):
     my_normpath = os.path.normcase