diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f39425ad43..887f50cdee 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: black args: [--safe, --quiet] - exclude: tests/functional|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/ + exclude: tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/ - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.1.0 hooks: diff --git a/pylint/checkers/typecheck.py b/pylint/checkers/typecheck.py index b12f761dad..598462853c 100644 --- a/pylint/checkers/typecheck.py +++ b/pylint/checkers/typecheck.py @@ -1187,7 +1187,6 @@ def visit_call(self, node): num_positional_args += implicit_args + already_filled_positionals # Analyze the list of formal parameters. - args = list(itertools.chain(called.args.posonlyargs or (), called.args.args)) num_mandatory_parameters = len(args) - len(called.args.defaults) parameters = [] diff --git a/tests/functional/assignment_from_no_return_py3.txt b/tests/functional/a/__init__.py similarity index 100% rename from tests/functional/assignment_from_no_return_py3.txt rename to tests/functional/a/__init__.py diff --git a/tests/functional/abstract_abc_methods.py b/tests/functional/a/abstract_abc_methods.py similarity index 100% rename from tests/functional/abstract_abc_methods.py rename to tests/functional/a/abstract_abc_methods.py diff --git a/tests/functional/abstract_class_instantiated_in_class.py b/tests/functional/a/abstract_class_instantiated_in_class.py similarity index 100% rename from tests/functional/abstract_class_instantiated_in_class.py rename to tests/functional/a/abstract_class_instantiated_in_class.py diff --git a/tests/functional/abstract_class_instantiated_py2.py b/tests/functional/a/abstract_class_instantiated_py2.py similarity index 100% rename from tests/functional/abstract_class_instantiated_py2.py rename to tests/functional/a/abstract_class_instantiated_py2.py diff --git a/tests/functional/abstract_class_instantiated_py2.rc b/tests/functional/a/abstract_class_instantiated_py2.rc similarity index 100% rename from tests/functional/abstract_class_instantiated_py2.rc rename to tests/functional/a/abstract_class_instantiated_py2.rc diff --git a/tests/functional/abstract_class_instantiated_py2.txt b/tests/functional/a/abstract_class_instantiated_py2.txt similarity index 100% rename from tests/functional/abstract_class_instantiated_py2.txt rename to tests/functional/a/abstract_class_instantiated_py2.txt diff --git a/tests/functional/abstract_class_instantiated_py3.py b/tests/functional/a/abstract_class_instantiated_py3.py similarity index 100% rename from tests/functional/abstract_class_instantiated_py3.py rename to tests/functional/a/abstract_class_instantiated_py3.py diff --git a/tests/functional/abstract_class_instantiated_py3.rc b/tests/functional/a/abstract_class_instantiated_py3.rc similarity index 100% rename from tests/functional/abstract_class_instantiated_py3.rc rename to tests/functional/a/abstract_class_instantiated_py3.rc diff --git a/tests/functional/abstract_class_instantiated_py3.txt b/tests/functional/a/abstract_class_instantiated_py3.txt similarity index 100% rename from tests/functional/abstract_class_instantiated_py3.txt rename to tests/functional/a/abstract_class_instantiated_py3.txt diff --git a/tests/functional/abstract_class_instantiated_py34.py b/tests/functional/a/abstract_class_instantiated_py34.py similarity index 100% rename from tests/functional/abstract_class_instantiated_py34.py rename to tests/functional/a/abstract_class_instantiated_py34.py diff --git a/tests/functional/abstract_class_instantiated_py34.rc b/tests/functional/a/abstract_class_instantiated_py34.rc similarity index 100% rename from tests/functional/abstract_class_instantiated_py34.rc rename to tests/functional/a/abstract_class_instantiated_py34.rc diff --git a/tests/functional/abstract_class_instantiated_py34.txt b/tests/functional/a/abstract_class_instantiated_py34.txt similarity index 100% rename from tests/functional/abstract_class_instantiated_py34.txt rename to tests/functional/a/abstract_class_instantiated_py34.txt diff --git a/tests/functional/abstract_method_py2.py b/tests/functional/a/abstract_method_py2.py similarity index 100% rename from tests/functional/abstract_method_py2.py rename to tests/functional/a/abstract_method_py2.py diff --git a/tests/functional/abstract_method_py2.rc b/tests/functional/a/abstract_method_py2.rc similarity index 100% rename from tests/functional/abstract_method_py2.rc rename to tests/functional/a/abstract_method_py2.rc diff --git a/tests/functional/abstract_method_py2.txt b/tests/functional/a/abstract_method_py2.txt similarity index 100% rename from tests/functional/abstract_method_py2.txt rename to tests/functional/a/abstract_method_py2.txt diff --git a/tests/functional/abstract_method_py3.py b/tests/functional/a/abstract_method_py3.py similarity index 100% rename from tests/functional/abstract_method_py3.py rename to tests/functional/a/abstract_method_py3.py diff --git a/tests/functional/abstract_method_py3.rc b/tests/functional/a/abstract_method_py3.rc similarity index 100% rename from tests/functional/abstract_method_py3.rc rename to tests/functional/a/abstract_method_py3.rc diff --git a/tests/functional/abstract_method_py3.txt b/tests/functional/a/abstract_method_py3.txt similarity index 100% rename from tests/functional/abstract_method_py3.txt rename to tests/functional/a/abstract_method_py3.txt diff --git a/tests/functional/access_member_before_definition.py b/tests/functional/a/access_member_before_definition.py similarity index 100% rename from tests/functional/access_member_before_definition.py rename to tests/functional/a/access_member_before_definition.py diff --git a/tests/functional/access_member_before_definition.txt b/tests/functional/a/access_member_before_definition.txt similarity index 100% rename from tests/functional/access_member_before_definition.txt rename to tests/functional/a/access_member_before_definition.txt diff --git a/tests/functional/access_to__name__.py b/tests/functional/a/access_to__name__.py similarity index 100% rename from tests/functional/access_to__name__.py rename to tests/functional/a/access_to__name__.py diff --git a/tests/functional/access_to__name__.txt b/tests/functional/a/access_to__name__.txt similarity index 100% rename from tests/functional/access_to__name__.txt rename to tests/functional/a/access_to__name__.txt diff --git a/tests/functional/access_to_protected_members.py b/tests/functional/a/access_to_protected_members.py similarity index 100% rename from tests/functional/access_to_protected_members.py rename to tests/functional/a/access_to_protected_members.py diff --git a/tests/functional/access_to_protected_members.txt b/tests/functional/a/access_to_protected_members.txt similarity index 100% rename from tests/functional/access_to_protected_members.txt rename to tests/functional/a/access_to_protected_members.txt diff --git a/tests/functional/anomalous_unicode_escape_py2.py b/tests/functional/a/anomalous_unicode_escape_py2.py similarity index 100% rename from tests/functional/anomalous_unicode_escape_py2.py rename to tests/functional/a/anomalous_unicode_escape_py2.py diff --git a/tests/functional/anomalous_unicode_escape_py2.rc b/tests/functional/a/anomalous_unicode_escape_py2.rc similarity index 100% rename from tests/functional/anomalous_unicode_escape_py2.rc rename to tests/functional/a/anomalous_unicode_escape_py2.rc diff --git a/tests/functional/anomalous_unicode_escape_py2.txt b/tests/functional/a/anomalous_unicode_escape_py2.txt similarity index 100% rename from tests/functional/anomalous_unicode_escape_py2.txt rename to tests/functional/a/anomalous_unicode_escape_py2.txt diff --git a/tests/functional/anomalous_unicode_escape_py3.py b/tests/functional/a/anomalous_unicode_escape_py3.py similarity index 100% rename from tests/functional/anomalous_unicode_escape_py3.py rename to tests/functional/a/anomalous_unicode_escape_py3.py diff --git a/tests/functional/anomalous_unicode_escape_py3.rc b/tests/functional/a/anomalous_unicode_escape_py3.rc similarity index 100% rename from tests/functional/anomalous_unicode_escape_py3.rc rename to tests/functional/a/anomalous_unicode_escape_py3.rc diff --git a/tests/functional/anomalous_unicode_escape_py3.txt b/tests/functional/a/anomalous_unicode_escape_py3.txt similarity index 100% rename from tests/functional/anomalous_unicode_escape_py3.txt rename to tests/functional/a/anomalous_unicode_escape_py3.txt diff --git a/tests/functional/arguments.py b/tests/functional/a/arguments.py similarity index 100% rename from tests/functional/arguments.py rename to tests/functional/a/arguments.py diff --git a/tests/functional/a/arguments.rc b/tests/functional/a/arguments.rc new file mode 100644 index 0000000000..2b77453705 --- /dev/null +++ b/tests/functional/a/arguments.rc @@ -0,0 +1,2 @@ +[TYPECHECK] +signature-mutators=functional.a.arguments.mutation_decorator diff --git a/tests/functional/arguments.txt b/tests/functional/a/arguments.txt similarity index 100% rename from tests/functional/arguments.txt rename to tests/functional/a/arguments.txt diff --git a/tests/functional/arguments_differ.py b/tests/functional/a/arguments_differ.py similarity index 100% rename from tests/functional/arguments_differ.py rename to tests/functional/a/arguments_differ.py diff --git a/tests/functional/arguments_differ.txt b/tests/functional/a/arguments_differ.txt similarity index 100% rename from tests/functional/arguments_differ.txt rename to tests/functional/a/arguments_differ.txt diff --git a/tests/functional/arguments_differ_py3.py b/tests/functional/a/arguments_differ_py3.py similarity index 100% rename from tests/functional/arguments_differ_py3.py rename to tests/functional/a/arguments_differ_py3.py diff --git a/tests/functional/arguments_differ_py3.rc b/tests/functional/a/arguments_differ_py3.rc similarity index 100% rename from tests/functional/arguments_differ_py3.rc rename to tests/functional/a/arguments_differ_py3.rc diff --git a/tests/functional/arguments_differ_py3.txt b/tests/functional/a/arguments_differ_py3.txt similarity index 100% rename from tests/functional/arguments_differ_py3.txt rename to tests/functional/a/arguments_differ_py3.txt diff --git a/tests/functional/arguments_out_of_order.py b/tests/functional/a/arguments_out_of_order.py similarity index 100% rename from tests/functional/arguments_out_of_order.py rename to tests/functional/a/arguments_out_of_order.py diff --git a/tests/functional/arguments_out_of_order.txt b/tests/functional/a/arguments_out_of_order.txt similarity index 100% rename from tests/functional/arguments_out_of_order.txt rename to tests/functional/a/arguments_out_of_order.txt diff --git a/tests/functional/assert_on_tuple.py b/tests/functional/a/assert_on_tuple.py similarity index 100% rename from tests/functional/assert_on_tuple.py rename to tests/functional/a/assert_on_tuple.py diff --git a/tests/functional/assert_on_tuple.txt b/tests/functional/a/assert_on_tuple.txt similarity index 100% rename from tests/functional/assert_on_tuple.txt rename to tests/functional/a/assert_on_tuple.txt diff --git a/tests/functional/assigning_non_slot.py b/tests/functional/a/assigning_non_slot.py similarity index 100% rename from tests/functional/assigning_non_slot.py rename to tests/functional/a/assigning_non_slot.py diff --git a/tests/functional/assigning_non_slot.txt b/tests/functional/a/assigning_non_slot.txt similarity index 100% rename from tests/functional/assigning_non_slot.txt rename to tests/functional/a/assigning_non_slot.txt diff --git a/tests/functional/assignment_from_no_return.py b/tests/functional/a/assignment_from_no_return.py similarity index 100% rename from tests/functional/assignment_from_no_return.py rename to tests/functional/a/assignment_from_no_return.py diff --git a/tests/functional/assignment_from_no_return.txt b/tests/functional/a/assignment_from_no_return.txt similarity index 100% rename from tests/functional/assignment_from_no_return.txt rename to tests/functional/a/assignment_from_no_return.txt diff --git a/tests/functional/assignment_from_no_return_py3.py b/tests/functional/a/assignment_from_no_return_py3.py similarity index 100% rename from tests/functional/assignment_from_no_return_py3.py rename to tests/functional/a/assignment_from_no_return_py3.py diff --git a/tests/functional/assignment_from_no_return_py3.rc b/tests/functional/a/assignment_from_no_return_py3.rc similarity index 100% rename from tests/functional/assignment_from_no_return_py3.rc rename to tests/functional/a/assignment_from_no_return_py3.rc diff --git a/tests/functional/control_pragmas.txt b/tests/functional/a/assignment_from_no_return_py3.txt similarity index 100% rename from tests/functional/control_pragmas.txt rename to tests/functional/a/assignment_from_no_return_py3.txt diff --git a/tests/functional/async_functions.py b/tests/functional/a/async_functions.py similarity index 100% rename from tests/functional/async_functions.py rename to tests/functional/a/async_functions.py diff --git a/tests/functional/async_functions.rc b/tests/functional/a/async_functions.rc similarity index 100% rename from tests/functional/async_functions.rc rename to tests/functional/a/async_functions.rc diff --git a/tests/functional/async_functions.txt b/tests/functional/a/async_functions.txt similarity index 100% rename from tests/functional/async_functions.txt rename to tests/functional/a/async_functions.txt diff --git a/tests/functional/attribute_defined_outside_init.py b/tests/functional/a/attribute_defined_outside_init.py similarity index 100% rename from tests/functional/attribute_defined_outside_init.py rename to tests/functional/a/attribute_defined_outside_init.py diff --git a/tests/functional/attribute_defined_outside_init.txt b/tests/functional/a/attribute_defined_outside_init.txt similarity index 100% rename from tests/functional/attribute_defined_outside_init.txt rename to tests/functional/a/attribute_defined_outside_init.txt diff --git a/tests/functional/arguments.rc b/tests/functional/arguments.rc deleted file mode 100644 index bb6bf0e374..0000000000 --- a/tests/functional/arguments.rc +++ /dev/null @@ -1,2 +0,0 @@ -[TYPECHECK] -signature-mutators=functional.arguments.mutation_decorator diff --git a/tests/functional/crash_missing_module_type.txt b/tests/functional/b/__init__.py similarity index 100% rename from tests/functional/crash_missing_module_type.txt rename to tests/functional/b/__init__.py diff --git a/tests/functional/bad_continuation.py b/tests/functional/b/bad_continuation.py similarity index 100% rename from tests/functional/bad_continuation.py rename to tests/functional/b/bad_continuation.py diff --git a/tests/functional/bad_continuation.txt b/tests/functional/b/bad_continuation.txt similarity index 100% rename from tests/functional/bad_continuation.txt rename to tests/functional/b/bad_continuation.txt diff --git a/tests/functional/bad_continuation_py36.py b/tests/functional/b/bad_continuation_py36.py similarity index 100% rename from tests/functional/bad_continuation_py36.py rename to tests/functional/b/bad_continuation_py36.py diff --git a/tests/functional/bad_continuation_py36.rc b/tests/functional/b/bad_continuation_py36.rc similarity index 100% rename from tests/functional/bad_continuation_py36.rc rename to tests/functional/b/bad_continuation_py36.rc diff --git a/tests/functional/bad_continuation_tabs.py b/tests/functional/b/bad_continuation_tabs.py similarity index 100% rename from tests/functional/bad_continuation_tabs.py rename to tests/functional/b/bad_continuation_tabs.py diff --git a/tests/functional/bad_continuation_tabs.rc b/tests/functional/b/bad_continuation_tabs.rc similarity index 100% rename from tests/functional/bad_continuation_tabs.rc rename to tests/functional/b/bad_continuation_tabs.rc diff --git a/tests/functional/bad_continuation_tabs.txt b/tests/functional/b/bad_continuation_tabs.txt similarity index 100% rename from tests/functional/bad_continuation_tabs.txt rename to tests/functional/b/bad_continuation_tabs.txt diff --git a/tests/functional/bad_except_order.py b/tests/functional/b/bad_except_order.py similarity index 100% rename from tests/functional/bad_except_order.py rename to tests/functional/b/bad_except_order.py diff --git a/tests/functional/bad_except_order.txt b/tests/functional/b/bad_except_order.txt similarity index 100% rename from tests/functional/bad_except_order.txt rename to tests/functional/b/bad_except_order.txt diff --git a/tests/functional/bad_exception_context.py b/tests/functional/b/bad_exception_context.py similarity index 100% rename from tests/functional/bad_exception_context.py rename to tests/functional/b/bad_exception_context.py diff --git a/tests/functional/bad_exception_context.rc b/tests/functional/b/bad_exception_context.rc similarity index 100% rename from tests/functional/bad_exception_context.rc rename to tests/functional/b/bad_exception_context.rc diff --git a/tests/functional/bad_exception_context.txt b/tests/functional/b/bad_exception_context.txt similarity index 100% rename from tests/functional/bad_exception_context.txt rename to tests/functional/b/bad_exception_context.txt diff --git a/tests/functional/bad_indentation.py b/tests/functional/b/bad_indentation.py similarity index 100% rename from tests/functional/bad_indentation.py rename to tests/functional/b/bad_indentation.py diff --git a/tests/functional/bad_indentation.txt b/tests/functional/b/bad_indentation.txt similarity index 100% rename from tests/functional/bad_indentation.txt rename to tests/functional/b/bad_indentation.txt diff --git a/tests/functional/bad_inline_option.py b/tests/functional/b/bad_inline_option.py similarity index 100% rename from tests/functional/bad_inline_option.py rename to tests/functional/b/bad_inline_option.py diff --git a/tests/functional/bad_inline_option.rc b/tests/functional/b/bad_inline_option.rc similarity index 100% rename from tests/functional/bad_inline_option.rc rename to tests/functional/b/bad_inline_option.rc diff --git a/tests/functional/bad_inline_option.txt b/tests/functional/b/bad_inline_option.txt similarity index 100% rename from tests/functional/bad_inline_option.txt rename to tests/functional/b/bad_inline_option.txt diff --git a/tests/functional/bad_open_mode.py b/tests/functional/b/bad_open_mode.py similarity index 100% rename from tests/functional/bad_open_mode.py rename to tests/functional/b/bad_open_mode.py diff --git a/tests/functional/bad_open_mode.rc b/tests/functional/b/bad_open_mode.rc similarity index 100% rename from tests/functional/bad_open_mode.rc rename to tests/functional/b/bad_open_mode.rc diff --git a/tests/functional/bad_open_mode.txt b/tests/functional/b/bad_open_mode.txt similarity index 100% rename from tests/functional/bad_open_mode.txt rename to tests/functional/b/bad_open_mode.txt diff --git a/tests/functional/bad_open_mode_py3.py b/tests/functional/b/bad_open_mode_py3.py similarity index 100% rename from tests/functional/bad_open_mode_py3.py rename to tests/functional/b/bad_open_mode_py3.py diff --git a/tests/functional/bad_open_mode_py3.rc b/tests/functional/b/bad_open_mode_py3.rc similarity index 100% rename from tests/functional/bad_open_mode_py3.rc rename to tests/functional/b/bad_open_mode_py3.rc diff --git a/tests/functional/bad_open_mode_py3.txt b/tests/functional/b/bad_open_mode_py3.txt similarity index 100% rename from tests/functional/bad_open_mode_py3.txt rename to tests/functional/b/bad_open_mode_py3.txt diff --git a/tests/functional/bad_reversed_sequence.py b/tests/functional/b/bad_reversed_sequence.py similarity index 100% rename from tests/functional/bad_reversed_sequence.py rename to tests/functional/b/bad_reversed_sequence.py diff --git a/tests/functional/bad_reversed_sequence.txt b/tests/functional/b/bad_reversed_sequence.txt similarity index 100% rename from tests/functional/bad_reversed_sequence.txt rename to tests/functional/b/bad_reversed_sequence.txt diff --git a/tests/functional/bad_staticmethod_argument.py b/tests/functional/b/bad_staticmethod_argument.py similarity index 100% rename from tests/functional/bad_staticmethod_argument.py rename to tests/functional/b/bad_staticmethod_argument.py diff --git a/tests/functional/bad_staticmethod_argument.txt b/tests/functional/b/bad_staticmethod_argument.txt similarity index 100% rename from tests/functional/bad_staticmethod_argument.txt rename to tests/functional/b/bad_staticmethod_argument.txt diff --git a/tests/functional/bad_thread_instantiation.py b/tests/functional/b/bad_thread_instantiation.py similarity index 100% rename from tests/functional/bad_thread_instantiation.py rename to tests/functional/b/bad_thread_instantiation.py diff --git a/tests/functional/bad_thread_instantiation.txt b/tests/functional/b/bad_thread_instantiation.txt similarity index 100% rename from tests/functional/bad_thread_instantiation.txt rename to tests/functional/b/bad_thread_instantiation.txt diff --git a/tests/functional/bad_whitespace.py b/tests/functional/b/bad_whitespace.py similarity index 100% rename from tests/functional/bad_whitespace.py rename to tests/functional/b/bad_whitespace.py diff --git a/tests/functional/bad_whitespace.txt b/tests/functional/b/bad_whitespace.txt similarity index 100% rename from tests/functional/bad_whitespace.txt rename to tests/functional/b/bad_whitespace.txt diff --git a/tests/functional/bare_except.py b/tests/functional/b/bare_except.py similarity index 100% rename from tests/functional/bare_except.py rename to tests/functional/b/bare_except.py diff --git a/tests/functional/bare_except.txt b/tests/functional/b/bare_except.txt similarity index 100% rename from tests/functional/bare_except.txt rename to tests/functional/b/bare_except.txt diff --git a/tests/functional/blacklisted_name.py b/tests/functional/b/blacklisted_name.py similarity index 100% rename from tests/functional/blacklisted_name.py rename to tests/functional/b/blacklisted_name.py diff --git a/tests/functional/blacklisted_name.txt b/tests/functional/b/blacklisted_name.txt similarity index 100% rename from tests/functional/blacklisted_name.txt rename to tests/functional/b/blacklisted_name.txt diff --git a/tests/functional/boolean_datetime.py b/tests/functional/b/boolean_datetime.py similarity index 100% rename from tests/functional/boolean_datetime.py rename to tests/functional/b/boolean_datetime.py diff --git a/tests/functional/boolean_datetime.rc b/tests/functional/b/boolean_datetime.rc similarity index 100% rename from tests/functional/boolean_datetime.rc rename to tests/functional/b/boolean_datetime.rc diff --git a/tests/functional/boolean_datetime.txt b/tests/functional/b/boolean_datetime.txt similarity index 100% rename from tests/functional/boolean_datetime.txt rename to tests/functional/b/boolean_datetime.txt diff --git a/tests/functional/broad_except.py b/tests/functional/b/broad_except.py similarity index 100% rename from tests/functional/broad_except.py rename to tests/functional/b/broad_except.py diff --git a/tests/functional/broad_except.txt b/tests/functional/b/broad_except.txt similarity index 100% rename from tests/functional/broad_except.txt rename to tests/functional/b/broad_except.txt diff --git a/tests/functional/bugfix_local_scope_metaclass_1177.py b/tests/functional/b/bugfix_local_scope_metaclass_1177.py similarity index 100% rename from tests/functional/bugfix_local_scope_metaclass_1177.py rename to tests/functional/b/bugfix_local_scope_metaclass_1177.py diff --git a/tests/functional/bugfix_local_scope_metaclass_1177.rc b/tests/functional/b/bugfix_local_scope_metaclass_1177.rc similarity index 100% rename from tests/functional/bugfix_local_scope_metaclass_1177.rc rename to tests/functional/b/bugfix_local_scope_metaclass_1177.rc diff --git a/tests/functional/fallback_import_disabled.txt b/tests/functional/c/__init__.py similarity index 100% rename from tests/functional/fallback_import_disabled.txt rename to tests/functional/c/__init__.py diff --git a/tests/functional/cellvar_escaping_loop.py b/tests/functional/c/cellvar_escaping_loop.py similarity index 100% rename from tests/functional/cellvar_escaping_loop.py rename to tests/functional/c/cellvar_escaping_loop.py diff --git a/tests/functional/cellvar_escaping_loop.txt b/tests/functional/c/cellvar_escaping_loop.txt similarity index 100% rename from tests/functional/cellvar_escaping_loop.txt rename to tests/functional/c/cellvar_escaping_loop.txt diff --git a/tests/functional/class_members_py27.py b/tests/functional/c/class_members_py27.py similarity index 100% rename from tests/functional/class_members_py27.py rename to tests/functional/c/class_members_py27.py diff --git a/tests/functional/class_members_py27.rc b/tests/functional/c/class_members_py27.rc similarity index 100% rename from tests/functional/class_members_py27.rc rename to tests/functional/c/class_members_py27.rc diff --git a/tests/functional/class_members_py27.txt b/tests/functional/c/class_members_py27.txt similarity index 100% rename from tests/functional/class_members_py27.txt rename to tests/functional/c/class_members_py27.txt diff --git a/tests/functional/class_members_py30.py b/tests/functional/c/class_members_py30.py similarity index 100% rename from tests/functional/class_members_py30.py rename to tests/functional/c/class_members_py30.py diff --git a/tests/functional/class_members_py30.rc b/tests/functional/c/class_members_py30.rc similarity index 100% rename from tests/functional/class_members_py30.rc rename to tests/functional/c/class_members_py30.rc diff --git a/tests/functional/class_members_py30.txt b/tests/functional/c/class_members_py30.txt similarity index 100% rename from tests/functional/class_members_py30.txt rename to tests/functional/c/class_members_py30.txt diff --git a/tests/functional/class_members_py36.py b/tests/functional/c/class_members_py36.py similarity index 100% rename from tests/functional/class_members_py36.py rename to tests/functional/c/class_members_py36.py diff --git a/tests/functional/class_members_py36.rc b/tests/functional/c/class_members_py36.rc similarity index 100% rename from tests/functional/class_members_py36.rc rename to tests/functional/c/class_members_py36.rc diff --git a/tests/functional/class_scope.py b/tests/functional/c/class_scope.py similarity index 100% rename from tests/functional/class_scope.py rename to tests/functional/c/class_scope.py diff --git a/tests/functional/class_scope.txt b/tests/functional/c/class_scope.txt similarity index 100% rename from tests/functional/class_scope.txt rename to tests/functional/c/class_scope.txt diff --git a/tests/functional/comparison_with_callable.py b/tests/functional/c/comparison_with_callable.py similarity index 100% rename from tests/functional/comparison_with_callable.py rename to tests/functional/c/comparison_with_callable.py diff --git a/tests/functional/comparison_with_callable.txt b/tests/functional/c/comparison_with_callable.txt similarity index 100% rename from tests/functional/comparison_with_callable.txt rename to tests/functional/c/comparison_with_callable.txt diff --git a/tests/functional/confidence_filter.py b/tests/functional/c/confidence_filter.py similarity index 100% rename from tests/functional/confidence_filter.py rename to tests/functional/c/confidence_filter.py diff --git a/tests/functional/confidence_filter.rc b/tests/functional/c/confidence_filter.rc similarity index 100% rename from tests/functional/confidence_filter.rc rename to tests/functional/c/confidence_filter.rc diff --git a/tests/functional/confidence_filter.txt b/tests/functional/c/confidence_filter.txt similarity index 100% rename from tests/functional/confidence_filter.txt rename to tests/functional/c/confidence_filter.txt diff --git a/tests/functional/confusing_with_statement.py b/tests/functional/c/confusing_with_statement.py similarity index 100% rename from tests/functional/confusing_with_statement.py rename to tests/functional/c/confusing_with_statement.py diff --git a/tests/functional/confusing_with_statement.txt b/tests/functional/c/confusing_with_statement.txt similarity index 100% rename from tests/functional/confusing_with_statement.txt rename to tests/functional/c/confusing_with_statement.txt diff --git a/tests/functional/consider_iterating_dictionary.py b/tests/functional/c/consider_iterating_dictionary.py similarity index 100% rename from tests/functional/consider_iterating_dictionary.py rename to tests/functional/c/consider_iterating_dictionary.py diff --git a/tests/functional/consider_iterating_dictionary.txt b/tests/functional/c/consider_iterating_dictionary.txt similarity index 100% rename from tests/functional/consider_iterating_dictionary.txt rename to tests/functional/c/consider_iterating_dictionary.txt diff --git a/tests/functional/consider_join.py b/tests/functional/c/consider_join.py similarity index 100% rename from tests/functional/consider_join.py rename to tests/functional/c/consider_join.py diff --git a/tests/functional/consider_join.txt b/tests/functional/c/consider_join.txt similarity index 100% rename from tests/functional/consider_join.txt rename to tests/functional/c/consider_join.txt diff --git a/tests/functional/consider_merging_isinstance.py b/tests/functional/c/consider_merging_isinstance.py similarity index 100% rename from tests/functional/consider_merging_isinstance.py rename to tests/functional/c/consider_merging_isinstance.py diff --git a/tests/functional/consider_merging_isinstance.txt b/tests/functional/c/consider_merging_isinstance.txt similarity index 100% rename from tests/functional/consider_merging_isinstance.txt rename to tests/functional/c/consider_merging_isinstance.txt diff --git a/tests/functional/consider_swap_variables.py b/tests/functional/c/consider_swap_variables.py similarity index 100% rename from tests/functional/consider_swap_variables.py rename to tests/functional/c/consider_swap_variables.py diff --git a/tests/functional/consider_swap_variables.txt b/tests/functional/c/consider_swap_variables.txt similarity index 100% rename from tests/functional/consider_swap_variables.txt rename to tests/functional/c/consider_swap_variables.txt diff --git a/tests/functional/consider_using_dict_comprehension.py b/tests/functional/c/consider_using_dict_comprehension.py similarity index 100% rename from tests/functional/consider_using_dict_comprehension.py rename to tests/functional/c/consider_using_dict_comprehension.py diff --git a/tests/functional/consider_using_dict_comprehension.txt b/tests/functional/c/consider_using_dict_comprehension.txt similarity index 100% rename from tests/functional/consider_using_dict_comprehension.txt rename to tests/functional/c/consider_using_dict_comprehension.txt diff --git a/tests/functional/consider_using_enumerate.py b/tests/functional/c/consider_using_enumerate.py similarity index 100% rename from tests/functional/consider_using_enumerate.py rename to tests/functional/c/consider_using_enumerate.py diff --git a/tests/functional/consider_using_enumerate.txt b/tests/functional/c/consider_using_enumerate.txt similarity index 100% rename from tests/functional/consider_using_enumerate.txt rename to tests/functional/c/consider_using_enumerate.txt diff --git a/tests/functional/consider_using_get.py b/tests/functional/c/consider_using_get.py similarity index 100% rename from tests/functional/consider_using_get.py rename to tests/functional/c/consider_using_get.py diff --git a/tests/functional/consider_using_get.txt b/tests/functional/c/consider_using_get.txt similarity index 100% rename from tests/functional/consider_using_get.txt rename to tests/functional/c/consider_using_get.txt diff --git a/tests/functional/consider_using_in.py b/tests/functional/c/consider_using_in.py similarity index 100% rename from tests/functional/consider_using_in.py rename to tests/functional/c/consider_using_in.py diff --git a/tests/functional/consider_using_in.txt b/tests/functional/c/consider_using_in.txt similarity index 100% rename from tests/functional/consider_using_in.txt rename to tests/functional/c/consider_using_in.txt diff --git a/tests/functional/consider_using_set_comprehension.py b/tests/functional/c/consider_using_set_comprehension.py similarity index 100% rename from tests/functional/consider_using_set_comprehension.py rename to tests/functional/c/consider_using_set_comprehension.py diff --git a/tests/functional/consider_using_set_comprehension.txt b/tests/functional/c/consider_using_set_comprehension.txt similarity index 100% rename from tests/functional/consider_using_set_comprehension.txt rename to tests/functional/c/consider_using_set_comprehension.txt diff --git a/tests/functional/continue_in_finally.py b/tests/functional/c/continue_in_finally.py similarity index 100% rename from tests/functional/continue_in_finally.py rename to tests/functional/c/continue_in_finally.py diff --git a/tests/functional/continue_in_finally.txt b/tests/functional/c/continue_in_finally.txt similarity index 100% rename from tests/functional/continue_in_finally.txt rename to tests/functional/c/continue_in_finally.txt diff --git a/tests/functional/control_pragmas.py b/tests/functional/c/control_pragmas.py similarity index 100% rename from tests/functional/control_pragmas.py rename to tests/functional/c/control_pragmas.py diff --git a/tests/functional/formatting.txt b/tests/functional/c/control_pragmas.txt similarity index 100% rename from tests/functional/formatting.txt rename to tests/functional/c/control_pragmas.txt diff --git a/tests/functional/crash_missing_module_type.py b/tests/functional/c/crash_missing_module_type.py similarity index 100% rename from tests/functional/crash_missing_module_type.py rename to tests/functional/c/crash_missing_module_type.py diff --git a/tests/functional/genexp_in_class_scope.txt b/tests/functional/c/crash_missing_module_type.txt similarity index 100% rename from tests/functional/genexp_in_class_scope.txt rename to tests/functional/c/crash_missing_module_type.txt diff --git a/tests/functional/ctor_arguments.py b/tests/functional/c/ctor_arguments.py similarity index 98% rename from tests/functional/ctor_arguments.py rename to tests/functional/c/ctor_arguments.py index d9a9944a63..12bf8690ac 100644 --- a/tests/functional/ctor_arguments.py +++ b/tests/functional/c/ctor_arguments.py @@ -1,6 +1,6 @@ """Test function argument checker on __init__ -Based on test/functional/arguments.py +Based on tests/functional/a/arguments.py """ # pylint: disable=C0111,R0903,W0231, useless-object-inheritance diff --git a/tests/functional/ctor_arguments.txt b/tests/functional/c/ctor_arguments.txt similarity index 100% rename from tests/functional/ctor_arguments.txt rename to tests/functional/c/ctor_arguments.txt diff --git a/tests/functional/implicit_str_concat_in_sequence_latin1.txt b/tests/functional/d/__init__.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_latin1.txt rename to tests/functional/d/__init__.py diff --git a/tests/functional/dangerous_default_value.py b/tests/functional/d/dangerous_default_value.py similarity index 100% rename from tests/functional/dangerous_default_value.py rename to tests/functional/d/dangerous_default_value.py diff --git a/tests/functional/dangerous_default_value.rc b/tests/functional/d/dangerous_default_value.rc similarity index 100% rename from tests/functional/dangerous_default_value.rc rename to tests/functional/d/dangerous_default_value.rc diff --git a/tests/functional/dangerous_default_value.txt b/tests/functional/d/dangerous_default_value.txt similarity index 100% rename from tests/functional/dangerous_default_value.txt rename to tests/functional/d/dangerous_default_value.txt diff --git a/tests/functional/dangerous_default_value_py30.py b/tests/functional/d/dangerous_default_value_py30.py similarity index 100% rename from tests/functional/dangerous_default_value_py30.py rename to tests/functional/d/dangerous_default_value_py30.py diff --git a/tests/functional/dangerous_default_value_py30.rc b/tests/functional/d/dangerous_default_value_py30.rc similarity index 100% rename from tests/functional/dangerous_default_value_py30.rc rename to tests/functional/d/dangerous_default_value_py30.rc diff --git a/tests/functional/dangerous_default_value_py30.txt b/tests/functional/d/dangerous_default_value_py30.txt similarity index 100% rename from tests/functional/dangerous_default_value_py30.txt rename to tests/functional/d/dangerous_default_value_py30.txt diff --git a/tests/functional/defined_and_used_on_same_line.py b/tests/functional/d/defined_and_used_on_same_line.py similarity index 100% rename from tests/functional/defined_and_used_on_same_line.py rename to tests/functional/d/defined_and_used_on_same_line.py diff --git a/tests/functional/deprecated_lambda.py b/tests/functional/d/deprecated_lambda.py similarity index 100% rename from tests/functional/deprecated_lambda.py rename to tests/functional/d/deprecated_lambda.py diff --git a/tests/functional/deprecated_lambda.rc b/tests/functional/d/deprecated_lambda.rc similarity index 100% rename from tests/functional/deprecated_lambda.rc rename to tests/functional/d/deprecated_lambda.rc diff --git a/tests/functional/deprecated_lambda.txt b/tests/functional/d/deprecated_lambda.txt similarity index 100% rename from tests/functional/deprecated_lambda.txt rename to tests/functional/d/deprecated_lambda.txt diff --git a/tests/functional/deprecated_method_getmoduleinfo.py b/tests/functional/d/deprecated_method_getmoduleinfo.py similarity index 100% rename from tests/functional/deprecated_method_getmoduleinfo.py rename to tests/functional/d/deprecated_method_getmoduleinfo.py diff --git a/tests/functional/deprecated_method_getmoduleinfo.rc b/tests/functional/d/deprecated_method_getmoduleinfo.rc similarity index 100% rename from tests/functional/deprecated_method_getmoduleinfo.rc rename to tests/functional/d/deprecated_method_getmoduleinfo.rc diff --git a/tests/functional/deprecated_method_getmoduleinfo.txt b/tests/functional/d/deprecated_method_getmoduleinfo.txt similarity index 100% rename from tests/functional/deprecated_method_getmoduleinfo.txt rename to tests/functional/d/deprecated_method_getmoduleinfo.txt diff --git a/tests/functional/deprecated_methods_py2.py b/tests/functional/d/deprecated_methods_py2.py similarity index 100% rename from tests/functional/deprecated_methods_py2.py rename to tests/functional/d/deprecated_methods_py2.py diff --git a/tests/functional/deprecated_methods_py2.rc b/tests/functional/d/deprecated_methods_py2.rc similarity index 100% rename from tests/functional/deprecated_methods_py2.rc rename to tests/functional/d/deprecated_methods_py2.rc diff --git a/tests/functional/deprecated_methods_py2.txt b/tests/functional/d/deprecated_methods_py2.txt similarity index 100% rename from tests/functional/deprecated_methods_py2.txt rename to tests/functional/d/deprecated_methods_py2.txt diff --git a/tests/functional/deprecated_methods_py3.py b/tests/functional/d/deprecated_methods_py3.py similarity index 100% rename from tests/functional/deprecated_methods_py3.py rename to tests/functional/d/deprecated_methods_py3.py diff --git a/tests/functional/deprecated_methods_py3.rc b/tests/functional/d/deprecated_methods_py3.rc similarity index 100% rename from tests/functional/deprecated_methods_py3.rc rename to tests/functional/d/deprecated_methods_py3.rc diff --git a/tests/functional/deprecated_methods_py3.txt b/tests/functional/d/deprecated_methods_py3.txt similarity index 100% rename from tests/functional/deprecated_methods_py3.txt rename to tests/functional/d/deprecated_methods_py3.txt diff --git a/tests/functional/deprecated_methods_py36.py b/tests/functional/d/deprecated_methods_py36.py similarity index 100% rename from tests/functional/deprecated_methods_py36.py rename to tests/functional/d/deprecated_methods_py36.py diff --git a/tests/functional/deprecated_methods_py36.rc b/tests/functional/d/deprecated_methods_py36.rc similarity index 100% rename from tests/functional/deprecated_methods_py36.rc rename to tests/functional/d/deprecated_methods_py36.rc diff --git a/tests/functional/deprecated_methods_py36.txt b/tests/functional/d/deprecated_methods_py36.txt similarity index 100% rename from tests/functional/deprecated_methods_py36.txt rename to tests/functional/d/deprecated_methods_py36.txt diff --git a/tests/functional/deprecated_methods_py38.py b/tests/functional/d/deprecated_methods_py38.py similarity index 100% rename from tests/functional/deprecated_methods_py38.py rename to tests/functional/d/deprecated_methods_py38.py diff --git a/tests/functional/deprecated_methods_py38.rc b/tests/functional/d/deprecated_methods_py38.rc similarity index 100% rename from tests/functional/deprecated_methods_py38.rc rename to tests/functional/d/deprecated_methods_py38.rc diff --git a/tests/functional/deprecated_methods_py38.txt b/tests/functional/d/deprecated_methods_py38.txt similarity index 100% rename from tests/functional/deprecated_methods_py38.txt rename to tests/functional/d/deprecated_methods_py38.txt diff --git a/tests/functional/deprecated_module_py2.py b/tests/functional/d/deprecated_module_py2.py similarity index 100% rename from tests/functional/deprecated_module_py2.py rename to tests/functional/d/deprecated_module_py2.py diff --git a/tests/functional/deprecated_module_py2.rc b/tests/functional/d/deprecated_module_py2.rc similarity index 100% rename from tests/functional/deprecated_module_py2.rc rename to tests/functional/d/deprecated_module_py2.rc diff --git a/tests/functional/deprecated_module_py2.txt b/tests/functional/d/deprecated_module_py2.txt similarity index 100% rename from tests/functional/deprecated_module_py2.txt rename to tests/functional/d/deprecated_module_py2.txt diff --git a/tests/functional/deprecated_module_py3.py b/tests/functional/d/deprecated_module_py3.py similarity index 100% rename from tests/functional/deprecated_module_py3.py rename to tests/functional/d/deprecated_module_py3.py diff --git a/tests/functional/deprecated_module_py3.rc b/tests/functional/d/deprecated_module_py3.rc similarity index 100% rename from tests/functional/deprecated_module_py3.rc rename to tests/functional/d/deprecated_module_py3.rc diff --git a/tests/functional/deprecated_module_py3.txt b/tests/functional/d/deprecated_module_py3.txt similarity index 100% rename from tests/functional/deprecated_module_py3.txt rename to tests/functional/d/deprecated_module_py3.txt diff --git a/tests/functional/deprecated_module_py36.py b/tests/functional/d/deprecated_module_py36.py similarity index 100% rename from tests/functional/deprecated_module_py36.py rename to tests/functional/d/deprecated_module_py36.py diff --git a/tests/functional/deprecated_module_py36.rc b/tests/functional/d/deprecated_module_py36.rc similarity index 100% rename from tests/functional/deprecated_module_py36.rc rename to tests/functional/d/deprecated_module_py36.rc diff --git a/tests/functional/deprecated_module_py36.txt b/tests/functional/d/deprecated_module_py36.txt similarity index 100% rename from tests/functional/deprecated_module_py36.txt rename to tests/functional/d/deprecated_module_py36.txt diff --git a/tests/functional/deprecated_module_py4.py b/tests/functional/d/deprecated_module_py4.py similarity index 100% rename from tests/functional/deprecated_module_py4.py rename to tests/functional/d/deprecated_module_py4.py diff --git a/tests/functional/deprecated_module_py4.rc b/tests/functional/d/deprecated_module_py4.rc similarity index 100% rename from tests/functional/deprecated_module_py4.rc rename to tests/functional/d/deprecated_module_py4.rc diff --git a/tests/functional/deprecated_module_py4.txt b/tests/functional/d/deprecated_module_py4.txt similarity index 100% rename from tests/functional/deprecated_module_py4.txt rename to tests/functional/d/deprecated_module_py4.txt diff --git a/tests/functional/deprecated_module_uninstalled.py b/tests/functional/d/deprecated_module_uninstalled.py similarity index 100% rename from tests/functional/deprecated_module_uninstalled.py rename to tests/functional/d/deprecated_module_uninstalled.py diff --git a/tests/functional/deprecated_module_uninstalled.rc b/tests/functional/d/deprecated_module_uninstalled.rc similarity index 100% rename from tests/functional/deprecated_module_uninstalled.rc rename to tests/functional/d/deprecated_module_uninstalled.rc diff --git a/tests/functional/deprecated_module_uninstalled.txt b/tests/functional/d/deprecated_module_uninstalled.txt similarity index 100% rename from tests/functional/deprecated_module_uninstalled.txt rename to tests/functional/d/deprecated_module_uninstalled.txt diff --git a/tests/functional/dict_iter_missing_items.py b/tests/functional/d/dict_iter_missing_items.py similarity index 100% rename from tests/functional/dict_iter_missing_items.py rename to tests/functional/d/dict_iter_missing_items.py diff --git a/tests/functional/dict_iter_missing_items.txt b/tests/functional/d/dict_iter_missing_items.txt similarity index 100% rename from tests/functional/dict_iter_missing_items.txt rename to tests/functional/d/dict_iter_missing_items.txt diff --git a/tests/functional/disable_msg_github_issue_1389.py b/tests/functional/d/disable_msg_github_issue_1389.py similarity index 100% rename from tests/functional/disable_msg_github_issue_1389.py rename to tests/functional/d/disable_msg_github_issue_1389.py diff --git a/tests/functional/disable_msg_github_issue_1389.rc b/tests/functional/d/disable_msg_github_issue_1389.rc similarity index 100% rename from tests/functional/disable_msg_github_issue_1389.rc rename to tests/functional/d/disable_msg_github_issue_1389.rc diff --git a/tests/functional/disable_ungrouped_imports.py b/tests/functional/d/disable_ungrouped_imports.py similarity index 100% rename from tests/functional/disable_ungrouped_imports.py rename to tests/functional/d/disable_ungrouped_imports.py diff --git a/tests/functional/disable_ungrouped_imports.txt b/tests/functional/d/disable_ungrouped_imports.txt similarity index 100% rename from tests/functional/disable_ungrouped_imports.txt rename to tests/functional/d/disable_ungrouped_imports.txt diff --git a/tests/functional/disable_wrong_import_order.py b/tests/functional/d/disable_wrong_import_order.py similarity index 100% rename from tests/functional/disable_wrong_import_order.py rename to tests/functional/d/disable_wrong_import_order.py diff --git a/tests/functional/disable_wrong_import_order.txt b/tests/functional/d/disable_wrong_import_order.txt similarity index 100% rename from tests/functional/disable_wrong_import_order.txt rename to tests/functional/d/disable_wrong_import_order.txt diff --git a/tests/functional/disable_wrong_import_position.py b/tests/functional/d/disable_wrong_import_position.py similarity index 100% rename from tests/functional/disable_wrong_import_position.py rename to tests/functional/d/disable_wrong_import_position.py diff --git a/tests/functional/docstrings.py b/tests/functional/d/docstrings.py similarity index 100% rename from tests/functional/docstrings.py rename to tests/functional/d/docstrings.py diff --git a/tests/functional/docstrings.txt b/tests/functional/d/docstrings.txt similarity index 100% rename from tests/functional/docstrings.txt rename to tests/functional/d/docstrings.txt diff --git a/tests/functional/duplicate_argument_name.py b/tests/functional/d/duplicate_argument_name.py similarity index 100% rename from tests/functional/duplicate_argument_name.py rename to tests/functional/d/duplicate_argument_name.py diff --git a/tests/functional/duplicate_argument_name.txt b/tests/functional/d/duplicate_argument_name.txt similarity index 100% rename from tests/functional/duplicate_argument_name.txt rename to tests/functional/d/duplicate_argument_name.txt diff --git a/tests/functional/duplicate_argument_name_py3.py b/tests/functional/d/duplicate_argument_name_py3.py similarity index 100% rename from tests/functional/duplicate_argument_name_py3.py rename to tests/functional/d/duplicate_argument_name_py3.py diff --git a/tests/functional/duplicate_argument_name_py3.rc b/tests/functional/d/duplicate_argument_name_py3.rc similarity index 100% rename from tests/functional/duplicate_argument_name_py3.rc rename to tests/functional/d/duplicate_argument_name_py3.rc diff --git a/tests/functional/duplicate_argument_name_py3.txt b/tests/functional/d/duplicate_argument_name_py3.txt similarity index 100% rename from tests/functional/duplicate_argument_name_py3.txt rename to tests/functional/d/duplicate_argument_name_py3.txt diff --git a/tests/functional/duplicate_bases.py b/tests/functional/d/duplicate_bases.py similarity index 100% rename from tests/functional/duplicate_bases.py rename to tests/functional/d/duplicate_bases.py diff --git a/tests/functional/duplicate_bases.txt b/tests/functional/d/duplicate_bases.txt similarity index 100% rename from tests/functional/duplicate_bases.txt rename to tests/functional/d/duplicate_bases.txt diff --git a/tests/functional/duplicate_dict_literal_key.py b/tests/functional/d/duplicate_dict_literal_key.py similarity index 100% rename from tests/functional/duplicate_dict_literal_key.py rename to tests/functional/d/duplicate_dict_literal_key.py diff --git a/tests/functional/duplicate_dict_literal_key.txt b/tests/functional/d/duplicate_dict_literal_key.txt similarity index 100% rename from tests/functional/duplicate_dict_literal_key.txt rename to tests/functional/d/duplicate_dict_literal_key.txt diff --git a/tests/functional/duplicate_except.py b/tests/functional/d/duplicate_except.py similarity index 100% rename from tests/functional/duplicate_except.py rename to tests/functional/d/duplicate_except.py diff --git a/tests/functional/duplicate_except.txt b/tests/functional/d/duplicate_except.txt similarity index 100% rename from tests/functional/duplicate_except.txt rename to tests/functional/d/duplicate_except.txt diff --git a/tests/functional/duplicate_string_formatting_argument.py b/tests/functional/d/duplicate_string_formatting_argument.py similarity index 100% rename from tests/functional/duplicate_string_formatting_argument.py rename to tests/functional/d/duplicate_string_formatting_argument.py diff --git a/tests/functional/duplicate_string_formatting_argument.txt b/tests/functional/d/duplicate_string_formatting_argument.txt similarity index 100% rename from tests/functional/duplicate_string_formatting_argument.txt rename to tests/functional/d/duplicate_string_formatting_argument.txt diff --git a/tests/functional/implicit_str_concat_in_sequence_utf8.txt b/tests/functional/e/__init__.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_utf8.txt rename to tests/functional/e/__init__.py diff --git a/tests/functional/eval_used.py b/tests/functional/e/eval_used.py similarity index 100% rename from tests/functional/eval_used.py rename to tests/functional/e/eval_used.py diff --git a/tests/functional/eval_used.txt b/tests/functional/e/eval_used.txt similarity index 100% rename from tests/functional/eval_used.txt rename to tests/functional/e/eval_used.txt diff --git a/tests/functional/exception_is_binary_op.py b/tests/functional/e/exception_is_binary_op.py similarity index 100% rename from tests/functional/exception_is_binary_op.py rename to tests/functional/e/exception_is_binary_op.py diff --git a/tests/functional/exception_is_binary_op.txt b/tests/functional/e/exception_is_binary_op.txt similarity index 100% rename from tests/functional/exception_is_binary_op.txt rename to tests/functional/e/exception_is_binary_op.txt diff --git a/tests/functional/exception_message.py b/tests/functional/e/exception_message.py similarity index 100% rename from tests/functional/exception_message.py rename to tests/functional/e/exception_message.py diff --git a/tests/functional/exception_message.rc b/tests/functional/e/exception_message.rc similarity index 100% rename from tests/functional/exception_message.rc rename to tests/functional/e/exception_message.rc diff --git a/tests/functional/exception_message.txt b/tests/functional/e/exception_message.txt similarity index 100% rename from tests/functional/exception_message.txt rename to tests/functional/e/exception_message.txt diff --git a/tests/functional/exec_used_py2.py b/tests/functional/e/exec_used_py2.py similarity index 100% rename from tests/functional/exec_used_py2.py rename to tests/functional/e/exec_used_py2.py diff --git a/tests/functional/exec_used_py2.rc b/tests/functional/e/exec_used_py2.rc similarity index 100% rename from tests/functional/exec_used_py2.rc rename to tests/functional/e/exec_used_py2.rc diff --git a/tests/functional/exec_used_py2.txt b/tests/functional/e/exec_used_py2.txt similarity index 100% rename from tests/functional/exec_used_py2.txt rename to tests/functional/e/exec_used_py2.txt diff --git a/tests/functional/exec_used_py3.py b/tests/functional/e/exec_used_py3.py similarity index 100% rename from tests/functional/exec_used_py3.py rename to tests/functional/e/exec_used_py3.py diff --git a/tests/functional/exec_used_py3.rc b/tests/functional/e/exec_used_py3.rc similarity index 100% rename from tests/functional/exec_used_py3.rc rename to tests/functional/e/exec_used_py3.rc diff --git a/tests/functional/exec_used_py3.txt b/tests/functional/e/exec_used_py3.txt similarity index 100% rename from tests/functional/exec_used_py3.txt rename to tests/functional/e/exec_used_py3.txt diff --git a/tests/functional/invalid_metaclass.txt b/tests/functional/f/__init__.py similarity index 100% rename from tests/functional/invalid_metaclass.txt rename to tests/functional/f/__init__.py diff --git a/tests/functional/fallback_import_disabled.py b/tests/functional/f/fallback_import_disabled.py similarity index 100% rename from tests/functional/fallback_import_disabled.py rename to tests/functional/f/fallback_import_disabled.py diff --git a/tests/functional/invalid_metaclass_py3.txt b/tests/functional/f/fallback_import_disabled.txt similarity index 100% rename from tests/functional/invalid_metaclass_py3.txt rename to tests/functional/f/fallback_import_disabled.txt diff --git a/tests/functional/fallback_import_enabled.py b/tests/functional/f/fallback_import_enabled.py similarity index 100% rename from tests/functional/fallback_import_enabled.py rename to tests/functional/f/fallback_import_enabled.py diff --git a/tests/functional/fallback_import_enabled.rc b/tests/functional/f/fallback_import_enabled.rc similarity index 100% rename from tests/functional/fallback_import_enabled.rc rename to tests/functional/f/fallback_import_enabled.rc diff --git a/tests/functional/fallback_import_enabled.txt b/tests/functional/f/fallback_import_enabled.txt similarity index 100% rename from tests/functional/fallback_import_enabled.txt rename to tests/functional/f/fallback_import_enabled.txt diff --git a/tests/functional/fixme.py b/tests/functional/f/fixme.py similarity index 100% rename from tests/functional/fixme.py rename to tests/functional/f/fixme.py diff --git a/tests/functional/fixme.txt b/tests/functional/f/fixme.txt similarity index 100% rename from tests/functional/fixme.txt rename to tests/functional/f/fixme.txt diff --git a/tests/functional/fixme_bad_formatting_1139.py b/tests/functional/f/fixme_bad_formatting_1139.py similarity index 100% rename from tests/functional/fixme_bad_formatting_1139.py rename to tests/functional/f/fixme_bad_formatting_1139.py diff --git a/tests/functional/fixme_bad_formatting_1139.rc b/tests/functional/f/fixme_bad_formatting_1139.rc similarity index 100% rename from tests/functional/fixme_bad_formatting_1139.rc rename to tests/functional/f/fixme_bad_formatting_1139.rc diff --git a/tests/functional/fixme_bad_formatting_1139.txt b/tests/functional/f/fixme_bad_formatting_1139.txt similarity index 100% rename from tests/functional/fixme_bad_formatting_1139.txt rename to tests/functional/f/fixme_bad_formatting_1139.txt diff --git a/tests/functional/formatted_string_literal_with_if_py36.py b/tests/functional/f/formatted_string_literal_with_if_py36.py similarity index 100% rename from tests/functional/formatted_string_literal_with_if_py36.py rename to tests/functional/f/formatted_string_literal_with_if_py36.py diff --git a/tests/functional/formatted_string_literal_with_if_py36.rc b/tests/functional/f/formatted_string_literal_with_if_py36.rc similarity index 100% rename from tests/functional/formatted_string_literal_with_if_py36.rc rename to tests/functional/f/formatted_string_literal_with_if_py36.rc diff --git a/tests/functional/long_utf8_lines.txt b/tests/functional/f/formatting.txt similarity index 100% rename from tests/functional/long_utf8_lines.txt rename to tests/functional/f/formatting.txt diff --git a/tests/functional/function_redefined.py b/tests/functional/f/function_redefined.py similarity index 100% rename from tests/functional/function_redefined.py rename to tests/functional/f/function_redefined.py diff --git a/tests/functional/function_redefined.txt b/tests/functional/f/function_redefined.txt similarity index 100% rename from tests/functional/function_redefined.txt rename to tests/functional/f/function_redefined.txt diff --git a/tests/functional/future_import.py b/tests/functional/f/future_import.py similarity index 100% rename from tests/functional/future_import.py rename to tests/functional/f/future_import.py diff --git a/tests/functional/future_unicode_literals.py b/tests/functional/f/future_unicode_literals.py similarity index 100% rename from tests/functional/future_unicode_literals.py rename to tests/functional/f/future_unicode_literals.py diff --git a/tests/functional/future_unicode_literals.rc b/tests/functional/f/future_unicode_literals.rc similarity index 100% rename from tests/functional/future_unicode_literals.rc rename to tests/functional/f/future_unicode_literals.rc diff --git a/tests/functional/future_unicode_literals.txt b/tests/functional/f/future_unicode_literals.txt similarity index 100% rename from tests/functional/future_unicode_literals.txt rename to tests/functional/f/future_unicode_literals.txt diff --git a/tests/functional/monkeypatch_method.txt b/tests/functional/g/__init__.py similarity index 100% rename from tests/functional/monkeypatch_method.txt rename to tests/functional/g/__init__.py diff --git a/tests/functional/generated_members.py b/tests/functional/g/generated_members.py similarity index 100% rename from tests/functional/generated_members.py rename to tests/functional/g/generated_members.py diff --git a/tests/functional/generated_members.rc b/tests/functional/g/generated_members.rc similarity index 100% rename from tests/functional/generated_members.rc rename to tests/functional/g/generated_members.rc diff --git a/tests/functional/genexp_in_class_scope.py b/tests/functional/g/genexp_in_class_scope.py similarity index 100% rename from tests/functional/genexp_in_class_scope.py rename to tests/functional/g/genexp_in_class_scope.py diff --git a/tests/functional/not_async_context_manager_py37.txt b/tests/functional/g/genexp_in_class_scope.txt similarity index 100% rename from tests/functional/not_async_context_manager_py37.txt rename to tests/functional/g/genexp_in_class_scope.txt diff --git a/tests/functional/genexpr_variable_scope.py b/tests/functional/g/genexpr_variable_scope.py similarity index 100% rename from tests/functional/genexpr_variable_scope.py rename to tests/functional/g/genexpr_variable_scope.py diff --git a/tests/functional/genexpr_variable_scope.txt b/tests/functional/g/genexpr_variable_scope.txt similarity index 100% rename from tests/functional/genexpr_variable_scope.txt rename to tests/functional/g/genexpr_variable_scope.txt diff --git a/tests/functional/globals.py b/tests/functional/g/globals.py similarity index 100% rename from tests/functional/globals.py rename to tests/functional/g/globals.py diff --git a/tests/functional/globals.txt b/tests/functional/g/globals.txt similarity index 100% rename from tests/functional/globals.txt rename to tests/functional/g/globals.txt diff --git a/tests/functional/postponed_evaluation_activated.txt b/tests/functional/i/__init__.py similarity index 100% rename from tests/functional/postponed_evaluation_activated.txt rename to tests/functional/i/__init__.py diff --git a/tests/functional/implicit_str_concat_in_sequence.py b/tests/functional/i/implicit_str_concat_in_sequence.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence.py rename to tests/functional/i/implicit_str_concat_in_sequence.py diff --git a/tests/functional/implicit_str_concat_in_sequence.txt b/tests/functional/i/implicit_str_concat_in_sequence.txt similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence.txt rename to tests/functional/i/implicit_str_concat_in_sequence.txt diff --git a/tests/functional/implicit_str_concat_in_sequence_latin1.py b/tests/functional/i/implicit_str_concat_in_sequence_latin1.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_latin1.py rename to tests/functional/i/implicit_str_concat_in_sequence_latin1.py diff --git a/tests/functional/raising_self.txt b/tests/functional/i/implicit_str_concat_in_sequence_latin1.txt similarity index 100% rename from tests/functional/raising_self.txt rename to tests/functional/i/implicit_str_concat_in_sequence_latin1.txt diff --git a/tests/functional/implicit_str_concat_in_sequence_multiline.py b/tests/functional/i/implicit_str_concat_in_sequence_multiline.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_multiline.py rename to tests/functional/i/implicit_str_concat_in_sequence_multiline.py diff --git a/tests/functional/implicit_str_concat_in_sequence_multiline.rc b/tests/functional/i/implicit_str_concat_in_sequence_multiline.rc similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_multiline.rc rename to tests/functional/i/implicit_str_concat_in_sequence_multiline.rc diff --git a/tests/functional/implicit_str_concat_in_sequence_multiline.txt b/tests/functional/i/implicit_str_concat_in_sequence_multiline.txt similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_multiline.txt rename to tests/functional/i/implicit_str_concat_in_sequence_multiline.txt diff --git a/tests/functional/implicit_str_concat_in_sequence_utf8.py b/tests/functional/i/implicit_str_concat_in_sequence_utf8.py similarity index 100% rename from tests/functional/implicit_str_concat_in_sequence_utf8.py rename to tests/functional/i/implicit_str_concat_in_sequence_utf8.py diff --git a/tests/functional/recursion_error_2667.txt b/tests/functional/i/implicit_str_concat_in_sequence_utf8.txt similarity index 100% rename from tests/functional/recursion_error_2667.txt rename to tests/functional/i/implicit_str_concat_in_sequence_utf8.txt diff --git a/tests/functional/inconsistent_mro.py b/tests/functional/i/inconsistent_mro.py similarity index 100% rename from tests/functional/inconsistent_mro.py rename to tests/functional/i/inconsistent_mro.py diff --git a/tests/functional/inconsistent_mro.txt b/tests/functional/i/inconsistent_mro.txt similarity index 100% rename from tests/functional/inconsistent_mro.txt rename to tests/functional/i/inconsistent_mro.txt diff --git a/tests/functional/inconsistent_returns.py b/tests/functional/i/inconsistent_returns.py similarity index 100% rename from tests/functional/inconsistent_returns.py rename to tests/functional/i/inconsistent_returns.py diff --git a/tests/functional/inconsistent_returns.rc b/tests/functional/i/inconsistent_returns.rc similarity index 100% rename from tests/functional/inconsistent_returns.rc rename to tests/functional/i/inconsistent_returns.rc diff --git a/tests/functional/inconsistent_returns.txt b/tests/functional/i/inconsistent_returns.txt similarity index 100% rename from tests/functional/inconsistent_returns.txt rename to tests/functional/i/inconsistent_returns.txt diff --git a/tests/functional/indexing_exception.py b/tests/functional/i/indexing_exception.py similarity index 100% rename from tests/functional/indexing_exception.py rename to tests/functional/i/indexing_exception.py diff --git a/tests/functional/indexing_exception.rc b/tests/functional/i/indexing_exception.rc similarity index 100% rename from tests/functional/indexing_exception.rc rename to tests/functional/i/indexing_exception.rc diff --git a/tests/functional/indexing_exception.txt b/tests/functional/i/indexing_exception.txt similarity index 100% rename from tests/functional/indexing_exception.txt rename to tests/functional/i/indexing_exception.txt diff --git a/tests/functional/inherit_non_class.py b/tests/functional/i/inherit_non_class.py similarity index 100% rename from tests/functional/inherit_non_class.py rename to tests/functional/i/inherit_non_class.py diff --git a/tests/functional/inherit_non_class.txt b/tests/functional/i/inherit_non_class.txt similarity index 100% rename from tests/functional/inherit_non_class.txt rename to tests/functional/i/inherit_non_class.txt diff --git a/tests/functional/init_is_generator.py b/tests/functional/i/init_is_generator.py similarity index 100% rename from tests/functional/init_is_generator.py rename to tests/functional/i/init_is_generator.py diff --git a/tests/functional/init_is_generator.txt b/tests/functional/i/init_is_generator.txt similarity index 100% rename from tests/functional/init_is_generator.txt rename to tests/functional/i/init_is_generator.txt diff --git a/tests/functional/init_not_called.py b/tests/functional/i/init_not_called.py similarity index 100% rename from tests/functional/init_not_called.py rename to tests/functional/i/init_not_called.py diff --git a/tests/functional/init_not_called.txt b/tests/functional/i/init_not_called.txt similarity index 100% rename from tests/functional/init_not_called.txt rename to tests/functional/i/init_not_called.txt diff --git a/tests/functional/init_subclass_classmethod_py36.py b/tests/functional/i/init_subclass_classmethod_py36.py similarity index 100% rename from tests/functional/init_subclass_classmethod_py36.py rename to tests/functional/i/init_subclass_classmethod_py36.py diff --git a/tests/functional/init_subclass_classmethod_py36.rc b/tests/functional/i/init_subclass_classmethod_py36.rc similarity index 100% rename from tests/functional/init_subclass_classmethod_py36.rc rename to tests/functional/i/init_subclass_classmethod_py36.rc diff --git a/tests/functional/invalid_all_object.py b/tests/functional/i/invalid_all_object.py similarity index 100% rename from tests/functional/invalid_all_object.py rename to tests/functional/i/invalid_all_object.py diff --git a/tests/functional/invalid_all_object.txt b/tests/functional/i/invalid_all_object.txt similarity index 100% rename from tests/functional/invalid_all_object.txt rename to tests/functional/i/invalid_all_object.txt diff --git a/tests/functional/invalid_encoded_data.py b/tests/functional/i/invalid_encoded_data.py similarity index 100% rename from tests/functional/invalid_encoded_data.py rename to tests/functional/i/invalid_encoded_data.py diff --git a/tests/functional/invalid_encoded_data.rc b/tests/functional/i/invalid_encoded_data.rc similarity index 100% rename from tests/functional/invalid_encoded_data.rc rename to tests/functional/i/invalid_encoded_data.rc diff --git a/tests/functional/invalid_encoded_data.txt b/tests/functional/i/invalid_encoded_data.txt similarity index 100% rename from tests/functional/invalid_encoded_data.txt rename to tests/functional/i/invalid_encoded_data.txt diff --git a/tests/functional/invalid_encoding_py27.py b/tests/functional/i/invalid_encoding_py27.py similarity index 100% rename from tests/functional/invalid_encoding_py27.py rename to tests/functional/i/invalid_encoding_py27.py diff --git a/tests/functional/invalid_encoding_py27.rc b/tests/functional/i/invalid_encoding_py27.rc similarity index 100% rename from tests/functional/invalid_encoding_py27.rc rename to tests/functional/i/invalid_encoding_py27.rc diff --git a/tests/functional/invalid_encoding_py27.txt b/tests/functional/i/invalid_encoding_py27.txt similarity index 100% rename from tests/functional/invalid_encoding_py27.txt rename to tests/functional/i/invalid_encoding_py27.txt diff --git a/tests/functional/invalid_envvar_value.py b/tests/functional/i/invalid_envvar_value.py similarity index 100% rename from tests/functional/invalid_envvar_value.py rename to tests/functional/i/invalid_envvar_value.py diff --git a/tests/functional/invalid_envvar_value.txt b/tests/functional/i/invalid_envvar_value.txt similarity index 100% rename from tests/functional/invalid_envvar_value.txt rename to tests/functional/i/invalid_envvar_value.txt diff --git a/tests/functional/invalid_exceptions_caught.py b/tests/functional/i/invalid_exceptions_caught.py similarity index 100% rename from tests/functional/invalid_exceptions_caught.py rename to tests/functional/i/invalid_exceptions_caught.py diff --git a/tests/functional/invalid_exceptions_caught.txt b/tests/functional/i/invalid_exceptions_caught.txt similarity index 100% rename from tests/functional/invalid_exceptions_caught.txt rename to tests/functional/i/invalid_exceptions_caught.txt diff --git a/tests/functional/invalid_exceptions_raised.py b/tests/functional/i/invalid_exceptions_raised.py similarity index 100% rename from tests/functional/invalid_exceptions_raised.py rename to tests/functional/i/invalid_exceptions_raised.py diff --git a/tests/functional/invalid_exceptions_raised.txt b/tests/functional/i/invalid_exceptions_raised.txt similarity index 100% rename from tests/functional/invalid_exceptions_raised.txt rename to tests/functional/i/invalid_exceptions_raised.txt diff --git a/tests/functional/invalid_length_returned.py b/tests/functional/i/invalid_length_returned.py similarity index 100% rename from tests/functional/invalid_length_returned.py rename to tests/functional/i/invalid_length_returned.py diff --git a/tests/functional/invalid_length_returned.txt b/tests/functional/i/invalid_length_returned.txt similarity index 100% rename from tests/functional/invalid_length_returned.txt rename to tests/functional/i/invalid_length_returned.txt diff --git a/tests/functional/invalid_metaclass.py b/tests/functional/i/invalid_metaclass.py similarity index 100% rename from tests/functional/invalid_metaclass.py rename to tests/functional/i/invalid_metaclass.py diff --git a/tests/functional/recursion_error_crash.txt b/tests/functional/i/invalid_metaclass.txt similarity index 100% rename from tests/functional/recursion_error_crash.txt rename to tests/functional/i/invalid_metaclass.txt diff --git a/tests/functional/invalid_metaclass_py3.py b/tests/functional/i/invalid_metaclass_py3.py similarity index 100% rename from tests/functional/invalid_metaclass_py3.py rename to tests/functional/i/invalid_metaclass_py3.py diff --git a/tests/functional/invalid_metaclass_py3.rc b/tests/functional/i/invalid_metaclass_py3.rc similarity index 100% rename from tests/functional/invalid_metaclass_py3.rc rename to tests/functional/i/invalid_metaclass_py3.rc diff --git a/tests/functional/recursion_error_crash_2683.txt b/tests/functional/i/invalid_metaclass_py3.txt similarity index 100% rename from tests/functional/recursion_error_crash_2683.txt rename to tests/functional/i/invalid_metaclass_py3.txt diff --git a/tests/functional/invalid_name.py b/tests/functional/i/invalid_name.py similarity index 100% rename from tests/functional/invalid_name.py rename to tests/functional/i/invalid_name.py diff --git a/tests/functional/invalid_name.txt b/tests/functional/i/invalid_name.txt similarity index 100% rename from tests/functional/invalid_name.txt rename to tests/functional/i/invalid_name.txt diff --git a/tests/functional/invalid_overridden_method.py b/tests/functional/i/invalid_overridden_method.py similarity index 100% rename from tests/functional/invalid_overridden_method.py rename to tests/functional/i/invalid_overridden_method.py diff --git a/tests/functional/invalid_overridden_method.txt b/tests/functional/i/invalid_overridden_method.txt similarity index 100% rename from tests/functional/invalid_overridden_method.txt rename to tests/functional/i/invalid_overridden_method.txt diff --git a/tests/functional/invalid_sequence_index.py b/tests/functional/i/invalid_sequence_index.py similarity index 100% rename from tests/functional/invalid_sequence_index.py rename to tests/functional/i/invalid_sequence_index.py diff --git a/tests/functional/invalid_sequence_index.txt b/tests/functional/i/invalid_sequence_index.txt similarity index 100% rename from tests/functional/invalid_sequence_index.txt rename to tests/functional/i/invalid_sequence_index.txt diff --git a/tests/functional/invalid_slice_index.py b/tests/functional/i/invalid_slice_index.py similarity index 100% rename from tests/functional/invalid_slice_index.py rename to tests/functional/i/invalid_slice_index.py diff --git a/tests/functional/invalid_slice_index.txt b/tests/functional/i/invalid_slice_index.txt similarity index 100% rename from tests/functional/invalid_slice_index.txt rename to tests/functional/i/invalid_slice_index.txt diff --git a/tests/functional/invalid_star_assignment_target.py b/tests/functional/i/invalid_star_assignment_target.py similarity index 100% rename from tests/functional/invalid_star_assignment_target.py rename to tests/functional/i/invalid_star_assignment_target.py diff --git a/tests/functional/invalid_star_assignment_target.rc b/tests/functional/i/invalid_star_assignment_target.rc similarity index 100% rename from tests/functional/invalid_star_assignment_target.rc rename to tests/functional/i/invalid_star_assignment_target.rc diff --git a/tests/functional/invalid_star_assignment_target.txt b/tests/functional/i/invalid_star_assignment_target.txt similarity index 100% rename from tests/functional/invalid_star_assignment_target.txt rename to tests/functional/i/invalid_star_assignment_target.txt diff --git a/tests/functional/invalid_unary_operand_type.py b/tests/functional/i/invalid_unary_operand_type.py similarity index 100% rename from tests/functional/invalid_unary_operand_type.py rename to tests/functional/i/invalid_unary_operand_type.py diff --git a/tests/functional/invalid_unary_operand_type.txt b/tests/functional/i/invalid_unary_operand_type.txt similarity index 100% rename from tests/functional/invalid_unary_operand_type.txt rename to tests/functional/i/invalid_unary_operand_type.txt diff --git a/tests/functional/iterable_context.py b/tests/functional/i/iterable_context.py similarity index 100% rename from tests/functional/iterable_context.py rename to tests/functional/i/iterable_context.py diff --git a/tests/functional/iterable_context.txt b/tests/functional/i/iterable_context.txt similarity index 100% rename from tests/functional/iterable_context.txt rename to tests/functional/i/iterable_context.txt diff --git a/tests/functional/iterable_context_py2.py b/tests/functional/i/iterable_context_py2.py similarity index 100% rename from tests/functional/iterable_context_py2.py rename to tests/functional/i/iterable_context_py2.py diff --git a/tests/functional/iterable_context_py2.rc b/tests/functional/i/iterable_context_py2.rc similarity index 100% rename from tests/functional/iterable_context_py2.rc rename to tests/functional/i/iterable_context_py2.rc diff --git a/tests/functional/iterable_context_py2.txt b/tests/functional/i/iterable_context_py2.txt similarity index 100% rename from tests/functional/iterable_context_py2.txt rename to tests/functional/i/iterable_context_py2.txt diff --git a/tests/functional/iterable_context_py3.py b/tests/functional/i/iterable_context_py3.py similarity index 100% rename from tests/functional/iterable_context_py3.py rename to tests/functional/i/iterable_context_py3.py diff --git a/tests/functional/iterable_context_py3.rc b/tests/functional/i/iterable_context_py3.rc similarity index 100% rename from tests/functional/iterable_context_py3.rc rename to tests/functional/i/iterable_context_py3.rc diff --git a/tests/functional/iterable_context_py3.txt b/tests/functional/i/iterable_context_py3.txt similarity index 100% rename from tests/functional/iterable_context_py3.txt rename to tests/functional/i/iterable_context_py3.txt diff --git a/tests/functional/iterable_context_py36.py b/tests/functional/i/iterable_context_py36.py similarity index 100% rename from tests/functional/iterable_context_py36.py rename to tests/functional/i/iterable_context_py36.py diff --git a/tests/functional/iterable_context_py36.rc b/tests/functional/i/iterable_context_py36.rc similarity index 100% rename from tests/functional/iterable_context_py36.rc rename to tests/functional/i/iterable_context_py36.rc diff --git a/tests/functional/iterable_context_py36.txt b/tests/functional/i/iterable_context_py36.txt similarity index 100% rename from tests/functional/iterable_context_py36.txt rename to tests/functional/i/iterable_context_py36.txt diff --git a/tests/functional/import_error.py b/tests/functional/import_error.py index 69fd15be14..70b83018be 100644 --- a/tests/functional/import_error.py +++ b/tests/functional/import_error.py @@ -24,6 +24,6 @@ except ImportError: pass -from .collections import missing # [import-error] +from c.collections import missing # [import-error] from .syntax_error import toto # [syntax-error] diff --git a/tests/functional/import_error.txt b/tests/functional/import_error.txt index 493e79a01f..4d05275f2e 100644 --- a/tests/functional/import_error.txt +++ b/tests/functional/import_error.txt @@ -1,4 +1,4 @@ import-error:3::"Unable to import 'totally_missing'" import-error:16::"Unable to import 'maybe_missing_2'" -import-error:27::"Unable to import 'functional.collections'" +import-error:27::"Unable to import 'c.collections'" syntax-error:29::"Cannot import 'syntax_error' due to syntax error 'invalid syntax (, line 1)'" diff --git a/tests/functional/recursion_error_crash_astroid_623.txt b/tests/functional/k/__init__.py similarity index 100% rename from tests/functional/recursion_error_crash_astroid_623.txt rename to tests/functional/k/__init__.py diff --git a/tests/functional/keyword_arg_before_vararg.py b/tests/functional/k/keyword_arg_before_vararg.py similarity index 100% rename from tests/functional/keyword_arg_before_vararg.py rename to tests/functional/k/keyword_arg_before_vararg.py diff --git a/tests/functional/keyword_arg_before_vararg.txt b/tests/functional/k/keyword_arg_before_vararg.txt similarity index 100% rename from tests/functional/keyword_arg_before_vararg.txt rename to tests/functional/k/keyword_arg_before_vararg.txt diff --git a/tests/functional/regression_no_value_for_parameter.txt b/tests/functional/l/__init__.py similarity index 100% rename from tests/functional/regression_no_value_for_parameter.txt rename to tests/functional/l/__init__.py diff --git a/tests/functional/len_checks.py b/tests/functional/l/len_checks.py similarity index 100% rename from tests/functional/len_checks.py rename to tests/functional/l/len_checks.py diff --git a/tests/functional/len_checks.txt b/tests/functional/l/len_checks.txt similarity index 100% rename from tests/functional/len_checks.txt rename to tests/functional/l/len_checks.txt diff --git a/tests/functional/line_endings.py b/tests/functional/l/line_endings.py similarity index 100% rename from tests/functional/line_endings.py rename to tests/functional/l/line_endings.py diff --git a/tests/functional/line_endings.rc b/tests/functional/l/line_endings.rc similarity index 100% rename from tests/functional/line_endings.rc rename to tests/functional/l/line_endings.rc diff --git a/tests/functional/line_endings.txt b/tests/functional/l/line_endings.txt similarity index 100% rename from tests/functional/line_endings.txt rename to tests/functional/l/line_endings.txt diff --git a/tests/functional/line_too_long.py b/tests/functional/l/line_too_long.py similarity index 100% rename from tests/functional/line_too_long.py rename to tests/functional/l/line_too_long.py diff --git a/tests/functional/line_too_long.txt b/tests/functional/l/line_too_long.txt similarity index 100% rename from tests/functional/line_too_long.txt rename to tests/functional/l/line_too_long.txt diff --git a/tests/functional/line_too_long_end_of_module.py b/tests/functional/l/line_too_long_end_of_module.py similarity index 100% rename from tests/functional/line_too_long_end_of_module.py rename to tests/functional/l/line_too_long_end_of_module.py diff --git a/tests/functional/literal_comparison.py b/tests/functional/l/literal_comparison.py similarity index 100% rename from tests/functional/literal_comparison.py rename to tests/functional/l/literal_comparison.py diff --git a/tests/functional/literal_comparison.txt b/tests/functional/l/literal_comparison.txt similarity index 100% rename from tests/functional/literal_comparison.txt rename to tests/functional/l/literal_comparison.txt diff --git a/tests/functional/logging_format_interpolation.py b/tests/functional/l/logging_format_interpolation.py similarity index 100% rename from tests/functional/logging_format_interpolation.py rename to tests/functional/l/logging_format_interpolation.py diff --git a/tests/functional/logging_format_interpolation.txt b/tests/functional/l/logging_format_interpolation.txt similarity index 100% rename from tests/functional/logging_format_interpolation.txt rename to tests/functional/l/logging_format_interpolation.txt diff --git a/tests/functional/logging_format_interpolation_py36.py b/tests/functional/l/logging_format_interpolation_py36.py similarity index 100% rename from tests/functional/logging_format_interpolation_py36.py rename to tests/functional/l/logging_format_interpolation_py36.py diff --git a/tests/functional/logging_format_interpolation_py36.rc b/tests/functional/l/logging_format_interpolation_py36.rc similarity index 100% rename from tests/functional/logging_format_interpolation_py36.rc rename to tests/functional/l/logging_format_interpolation_py36.rc diff --git a/tests/functional/logging_format_interpolation_py36.txt b/tests/functional/l/logging_format_interpolation_py36.txt similarity index 100% rename from tests/functional/logging_format_interpolation_py36.txt rename to tests/functional/l/logging_format_interpolation_py36.txt diff --git a/tests/functional/logging_fstring_interpolation_py36.py b/tests/functional/l/logging_fstring_interpolation_py36.py similarity index 100% rename from tests/functional/logging_fstring_interpolation_py36.py rename to tests/functional/l/logging_fstring_interpolation_py36.py diff --git a/tests/functional/logging_fstring_interpolation_py36.rc b/tests/functional/l/logging_fstring_interpolation_py36.rc similarity index 100% rename from tests/functional/logging_fstring_interpolation_py36.rc rename to tests/functional/l/logging_fstring_interpolation_py36.rc diff --git a/tests/functional/logging_fstring_interpolation_py36.txt b/tests/functional/l/logging_fstring_interpolation_py36.txt similarity index 100% rename from tests/functional/logging_fstring_interpolation_py36.txt rename to tests/functional/l/logging_fstring_interpolation_py36.txt diff --git a/tests/functional/logging_not_lazy.py b/tests/functional/l/logging_not_lazy.py similarity index 100% rename from tests/functional/logging_not_lazy.py rename to tests/functional/l/logging_not_lazy.py diff --git a/tests/functional/logging_not_lazy.txt b/tests/functional/l/logging_not_lazy.txt similarity index 100% rename from tests/functional/logging_not_lazy.txt rename to tests/functional/l/logging_not_lazy.txt diff --git a/tests/functional/logical_tautology.py b/tests/functional/l/logical_tautology.py similarity index 100% rename from tests/functional/logical_tautology.py rename to tests/functional/l/logical_tautology.py diff --git a/tests/functional/logical_tautology.txt b/tests/functional/l/logical_tautology.txt similarity index 100% rename from tests/functional/logical_tautology.txt rename to tests/functional/l/logical_tautology.txt diff --git a/tests/functional/long_lines_with_utf8.py b/tests/functional/l/long_lines_with_utf8.py similarity index 100% rename from tests/functional/long_lines_with_utf8.py rename to tests/functional/l/long_lines_with_utf8.py diff --git a/tests/functional/long_lines_with_utf8.txt b/tests/functional/l/long_lines_with_utf8.txt similarity index 100% rename from tests/functional/long_lines_with_utf8.txt rename to tests/functional/l/long_lines_with_utf8.txt diff --git a/tests/functional/long_utf8_lines.py b/tests/functional/l/long_utf8_lines.py similarity index 100% rename from tests/functional/long_utf8_lines.py rename to tests/functional/l/long_utf8_lines.py diff --git a/tests/functional/too_few_public_methods_37.txt b/tests/functional/l/long_utf8_lines.txt similarity index 100% rename from tests/functional/too_few_public_methods_37.txt rename to tests/functional/l/long_utf8_lines.txt diff --git a/tests/functional/lost_exception.py b/tests/functional/l/lost_exception.py similarity index 100% rename from tests/functional/lost_exception.py rename to tests/functional/l/lost_exception.py diff --git a/tests/functional/lost_exception.txt b/tests/functional/l/lost_exception.txt similarity index 100% rename from tests/functional/lost_exception.txt rename to tests/functional/l/lost_exception.txt diff --git a/tests/functional/too_many_arguments_issue_1045.txt b/tests/functional/m/__init__.py similarity index 100% rename from tests/functional/too_many_arguments_issue_1045.txt rename to tests/functional/m/__init__.py diff --git a/tests/functional/mapping_context.py b/tests/functional/m/mapping_context.py similarity index 100% rename from tests/functional/mapping_context.py rename to tests/functional/m/mapping_context.py diff --git a/tests/functional/mapping_context.txt b/tests/functional/m/mapping_context.txt similarity index 100% rename from tests/functional/mapping_context.txt rename to tests/functional/m/mapping_context.txt diff --git a/tests/functional/mapping_context_py2.py b/tests/functional/m/mapping_context_py2.py similarity index 100% rename from tests/functional/mapping_context_py2.py rename to tests/functional/m/mapping_context_py2.py diff --git a/tests/functional/mapping_context_py2.rc b/tests/functional/m/mapping_context_py2.rc similarity index 100% rename from tests/functional/mapping_context_py2.rc rename to tests/functional/m/mapping_context_py2.rc diff --git a/tests/functional/mapping_context_py2.txt b/tests/functional/m/mapping_context_py2.txt similarity index 100% rename from tests/functional/mapping_context_py2.txt rename to tests/functional/m/mapping_context_py2.txt diff --git a/tests/functional/mapping_context_py3.py b/tests/functional/m/mapping_context_py3.py similarity index 100% rename from tests/functional/mapping_context_py3.py rename to tests/functional/m/mapping_context_py3.py diff --git a/tests/functional/mapping_context_py3.rc b/tests/functional/m/mapping_context_py3.rc similarity index 100% rename from tests/functional/mapping_context_py3.rc rename to tests/functional/m/mapping_context_py3.rc diff --git a/tests/functional/mapping_context_py3.txt b/tests/functional/m/mapping_context_py3.txt similarity index 100% rename from tests/functional/mapping_context_py3.txt rename to tests/functional/m/mapping_context_py3.txt diff --git a/tests/functional/member_checks.py b/tests/functional/m/member_checks.py similarity index 100% rename from tests/functional/member_checks.py rename to tests/functional/m/member_checks.py diff --git a/tests/functional/member_checks.txt b/tests/functional/m/member_checks.txt similarity index 100% rename from tests/functional/member_checks.txt rename to tests/functional/m/member_checks.txt diff --git a/tests/functional/member_checks_hints.py b/tests/functional/m/member_checks_hints.py similarity index 100% rename from tests/functional/member_checks_hints.py rename to tests/functional/m/member_checks_hints.py diff --git a/tests/functional/member_checks_hints.rc b/tests/functional/m/member_checks_hints.rc similarity index 100% rename from tests/functional/member_checks_hints.rc rename to tests/functional/m/member_checks_hints.rc diff --git a/tests/functional/member_checks_hints.txt b/tests/functional/m/member_checks_hints.txt similarity index 100% rename from tests/functional/member_checks_hints.txt rename to tests/functional/m/member_checks_hints.txt diff --git a/tests/functional/member_checks_ignore_none.py b/tests/functional/m/member_checks_ignore_none.py similarity index 100% rename from tests/functional/member_checks_ignore_none.py rename to tests/functional/m/member_checks_ignore_none.py diff --git a/tests/functional/member_checks_ignore_none.rc b/tests/functional/m/member_checks_ignore_none.rc similarity index 100% rename from tests/functional/member_checks_ignore_none.rc rename to tests/functional/m/member_checks_ignore_none.rc diff --git a/tests/functional/member_checks_ignore_none.txt b/tests/functional/m/member_checks_ignore_none.txt similarity index 100% rename from tests/functional/member_checks_ignore_none.txt rename to tests/functional/m/member_checks_ignore_none.txt diff --git a/tests/functional/member_checks_inference_improvements.py b/tests/functional/m/member_checks_inference_improvements.py similarity index 100% rename from tests/functional/member_checks_inference_improvements.py rename to tests/functional/m/member_checks_inference_improvements.py diff --git a/tests/functional/member_checks_no_hints.py b/tests/functional/m/member_checks_no_hints.py similarity index 100% rename from tests/functional/member_checks_no_hints.py rename to tests/functional/m/member_checks_no_hints.py diff --git a/tests/functional/member_checks_no_hints.rc b/tests/functional/m/member_checks_no_hints.rc similarity index 100% rename from tests/functional/member_checks_no_hints.rc rename to tests/functional/m/member_checks_no_hints.rc diff --git a/tests/functional/member_checks_no_hints.txt b/tests/functional/m/member_checks_no_hints.txt similarity index 100% rename from tests/functional/member_checks_no_hints.txt rename to tests/functional/m/member_checks_no_hints.txt diff --git a/tests/functional/member_checks_opaque.py b/tests/functional/m/member_checks_opaque.py similarity index 100% rename from tests/functional/member_checks_opaque.py rename to tests/functional/m/member_checks_opaque.py diff --git a/tests/functional/member_checks_opaque.rc b/tests/functional/m/member_checks_opaque.rc similarity index 100% rename from tests/functional/member_checks_opaque.rc rename to tests/functional/m/member_checks_opaque.rc diff --git a/tests/functional/member_checks_opaque.txt b/tests/functional/m/member_checks_opaque.txt similarity index 100% rename from tests/functional/member_checks_opaque.txt rename to tests/functional/m/member_checks_opaque.txt diff --git a/tests/functional/member_checks_py37.py b/tests/functional/m/member_checks_py37.py similarity index 100% rename from tests/functional/member_checks_py37.py rename to tests/functional/m/member_checks_py37.py diff --git a/tests/functional/member_checks_py37.rc b/tests/functional/m/member_checks_py37.rc similarity index 100% rename from tests/functional/member_checks_py37.rc rename to tests/functional/m/member_checks_py37.rc diff --git a/tests/functional/member_checks_py37.txt b/tests/functional/m/member_checks_py37.txt similarity index 100% rename from tests/functional/member_checks_py37.txt rename to tests/functional/m/member_checks_py37.txt diff --git a/tests/functional/membership_protocol.py b/tests/functional/m/membership_protocol.py similarity index 100% rename from tests/functional/membership_protocol.py rename to tests/functional/m/membership_protocol.py diff --git a/tests/functional/membership_protocol.txt b/tests/functional/m/membership_protocol.txt similarity index 100% rename from tests/functional/membership_protocol.txt rename to tests/functional/m/membership_protocol.txt diff --git a/tests/functional/membership_protocol_py2.py b/tests/functional/m/membership_protocol_py2.py similarity index 100% rename from tests/functional/membership_protocol_py2.py rename to tests/functional/m/membership_protocol_py2.py diff --git a/tests/functional/membership_protocol_py2.rc b/tests/functional/m/membership_protocol_py2.rc similarity index 100% rename from tests/functional/membership_protocol_py2.rc rename to tests/functional/m/membership_protocol_py2.rc diff --git a/tests/functional/membership_protocol_py2.txt b/tests/functional/m/membership_protocol_py2.txt similarity index 100% rename from tests/functional/membership_protocol_py2.txt rename to tests/functional/m/membership_protocol_py2.txt diff --git a/tests/functional/membership_protocol_py3.py b/tests/functional/m/membership_protocol_py3.py similarity index 100% rename from tests/functional/membership_protocol_py3.py rename to tests/functional/m/membership_protocol_py3.py diff --git a/tests/functional/membership_protocol_py3.rc b/tests/functional/m/membership_protocol_py3.rc similarity index 100% rename from tests/functional/membership_protocol_py3.rc rename to tests/functional/m/membership_protocol_py3.rc diff --git a/tests/functional/membership_protocol_py3.txt b/tests/functional/m/membership_protocol_py3.txt similarity index 100% rename from tests/functional/membership_protocol_py3.txt rename to tests/functional/m/membership_protocol_py3.txt diff --git a/tests/functional/messages_managed_by_id.py b/tests/functional/m/messages_managed_by_id.py similarity index 100% rename from tests/functional/messages_managed_by_id.py rename to tests/functional/m/messages_managed_by_id.py diff --git a/tests/functional/messages_managed_by_id.txt b/tests/functional/m/messages_managed_by_id.txt similarity index 100% rename from tests/functional/messages_managed_by_id.txt rename to tests/functional/m/messages_managed_by_id.txt diff --git a/tests/functional/method_hidden.py b/tests/functional/m/method_hidden.py similarity index 100% rename from tests/functional/method_hidden.py rename to tests/functional/m/method_hidden.py diff --git a/tests/functional/m/method_hidden.txt b/tests/functional/m/method_hidden.txt new file mode 100644 index 0000000000..227197112c --- /dev/null +++ b/tests/functional/m/method_hidden.txt @@ -0,0 +1 @@ +method-hidden:13:Cdef.abcd:An attribute defined in functional.m.method_hidden line 9 hides this method diff --git a/tests/functional/misplaced_bare_raise.py b/tests/functional/m/misplaced_bare_raise.py similarity index 100% rename from tests/functional/misplaced_bare_raise.py rename to tests/functional/m/misplaced_bare_raise.py diff --git a/tests/functional/misplaced_bare_raise.txt b/tests/functional/m/misplaced_bare_raise.txt similarity index 100% rename from tests/functional/misplaced_bare_raise.txt rename to tests/functional/m/misplaced_bare_raise.txt diff --git a/tests/functional/misplaced_comparison_constant.py b/tests/functional/m/misplaced_comparison_constant.py similarity index 100% rename from tests/functional/misplaced_comparison_constant.py rename to tests/functional/m/misplaced_comparison_constant.py diff --git a/tests/functional/misplaced_comparison_constant.txt b/tests/functional/m/misplaced_comparison_constant.txt similarity index 100% rename from tests/functional/misplaced_comparison_constant.txt rename to tests/functional/m/misplaced_comparison_constant.txt diff --git a/tests/functional/misplaced_format_function.py b/tests/functional/m/misplaced_format_function.py similarity index 100% rename from tests/functional/misplaced_format_function.py rename to tests/functional/m/misplaced_format_function.py diff --git a/tests/functional/misplaced_format_function.txt b/tests/functional/m/misplaced_format_function.txt similarity index 100% rename from tests/functional/misplaced_format_function.txt rename to tests/functional/m/misplaced_format_function.txt diff --git a/tests/functional/misplaced_future.py b/tests/functional/m/misplaced_future.py similarity index 100% rename from tests/functional/misplaced_future.py rename to tests/functional/m/misplaced_future.py diff --git a/tests/functional/misplaced_future.txt b/tests/functional/m/misplaced_future.txt similarity index 100% rename from tests/functional/misplaced_future.txt rename to tests/functional/m/misplaced_future.txt diff --git a/tests/functional/missing_docstring.py b/tests/functional/m/missing_docstring.py similarity index 100% rename from tests/functional/missing_docstring.py rename to tests/functional/m/missing_docstring.py diff --git a/tests/functional/missing_docstring.txt b/tests/functional/m/missing_docstring.txt similarity index 100% rename from tests/functional/missing_docstring.txt rename to tests/functional/m/missing_docstring.txt diff --git a/tests/functional/missing_final_newline.py b/tests/functional/m/missing_final_newline.py similarity index 100% rename from tests/functional/missing_final_newline.py rename to tests/functional/m/missing_final_newline.py diff --git a/tests/functional/missing_final_newline.txt b/tests/functional/m/missing_final_newline.txt similarity index 100% rename from tests/functional/missing_final_newline.txt rename to tests/functional/m/missing_final_newline.txt diff --git a/tests/functional/missing_kwoa_py3.py b/tests/functional/m/missing_kwoa_py3.py similarity index 100% rename from tests/functional/missing_kwoa_py3.py rename to tests/functional/m/missing_kwoa_py3.py diff --git a/tests/functional/missing_kwoa_py3.rc b/tests/functional/m/missing_kwoa_py3.rc similarity index 100% rename from tests/functional/missing_kwoa_py3.rc rename to tests/functional/m/missing_kwoa_py3.rc diff --git a/tests/functional/missing_kwoa_py3.txt b/tests/functional/m/missing_kwoa_py3.txt similarity index 100% rename from tests/functional/missing_kwoa_py3.txt rename to tests/functional/m/missing_kwoa_py3.txt diff --git a/tests/functional/missing_parentheses_for_call_in_test.py b/tests/functional/m/missing_parentheses_for_call_in_test.py similarity index 100% rename from tests/functional/missing_parentheses_for_call_in_test.py rename to tests/functional/m/missing_parentheses_for_call_in_test.py diff --git a/tests/functional/missing_parentheses_for_call_in_test.txt b/tests/functional/m/missing_parentheses_for_call_in_test.txt similarity index 100% rename from tests/functional/missing_parentheses_for_call_in_test.txt rename to tests/functional/m/missing_parentheses_for_call_in_test.txt diff --git a/tests/functional/missing_self_argument.py b/tests/functional/m/missing_self_argument.py similarity index 100% rename from tests/functional/missing_self_argument.py rename to tests/functional/m/missing_self_argument.py diff --git a/tests/functional/missing_self_argument.txt b/tests/functional/m/missing_self_argument.txt similarity index 100% rename from tests/functional/missing_self_argument.txt rename to tests/functional/m/missing_self_argument.txt diff --git a/tests/functional/mixed_indentation.py b/tests/functional/m/mixed_indentation.py similarity index 100% rename from tests/functional/mixed_indentation.py rename to tests/functional/m/mixed_indentation.py diff --git a/tests/functional/mixed_indentation.txt b/tests/functional/m/mixed_indentation.txt similarity index 100% rename from tests/functional/mixed_indentation.txt rename to tests/functional/m/mixed_indentation.txt diff --git a/tests/functional/monkeypatch_method.py b/tests/functional/m/monkeypatch_method.py similarity index 100% rename from tests/functional/monkeypatch_method.py rename to tests/functional/m/monkeypatch_method.py diff --git a/tests/functional/ungrouped_imports_isort_compatible.txt b/tests/functional/m/monkeypatch_method.txt similarity index 100% rename from tests/functional/ungrouped_imports_isort_compatible.txt rename to tests/functional/m/monkeypatch_method.txt diff --git a/tests/functional/multiple_imports.py b/tests/functional/m/multiple_imports.py similarity index 100% rename from tests/functional/multiple_imports.py rename to tests/functional/m/multiple_imports.py diff --git a/tests/functional/multiple_imports.txt b/tests/functional/m/multiple_imports.txt similarity index 100% rename from tests/functional/multiple_imports.txt rename to tests/functional/m/multiple_imports.txt diff --git a/tests/functional/method_hidden.txt b/tests/functional/method_hidden.txt deleted file mode 100644 index 7dfb8d3e00..0000000000 --- a/tests/functional/method_hidden.txt +++ /dev/null @@ -1 +0,0 @@ -method-hidden:13:Cdef.abcd:An attribute defined in functional.method_hidden line 9 hides this method diff --git a/tests/functional/unused_variable_py36.txt b/tests/functional/n/__init__.py similarity index 100% rename from tests/functional/unused_variable_py36.txt rename to tests/functional/n/__init__.py diff --git a/tests/functional/namePresetCamelCase.py b/tests/functional/n/namePresetCamelCase.py similarity index 100% rename from tests/functional/namePresetCamelCase.py rename to tests/functional/n/namePresetCamelCase.py diff --git a/tests/functional/namePresetCamelCase.rc b/tests/functional/n/namePresetCamelCase.rc similarity index 100% rename from tests/functional/namePresetCamelCase.rc rename to tests/functional/n/namePresetCamelCase.rc diff --git a/tests/functional/namePresetCamelCase.txt b/tests/functional/n/namePresetCamelCase.txt similarity index 100% rename from tests/functional/namePresetCamelCase.txt rename to tests/functional/n/namePresetCamelCase.txt diff --git a/tests/functional/name_preset_snake_case.py b/tests/functional/n/name_preset_snake_case.py similarity index 100% rename from tests/functional/name_preset_snake_case.py rename to tests/functional/n/name_preset_snake_case.py diff --git a/tests/functional/name_preset_snake_case.rc b/tests/functional/n/name_preset_snake_case.rc similarity index 100% rename from tests/functional/name_preset_snake_case.rc rename to tests/functional/n/name_preset_snake_case.rc diff --git a/tests/functional/name_preset_snake_case.txt b/tests/functional/n/name_preset_snake_case.txt similarity index 100% rename from tests/functional/name_preset_snake_case.txt rename to tests/functional/n/name_preset_snake_case.txt diff --git a/tests/functional/name_styles.py b/tests/functional/n/name_styles.py similarity index 100% rename from tests/functional/name_styles.py rename to tests/functional/n/name_styles.py diff --git a/tests/functional/name_styles.rc b/tests/functional/n/name_styles.rc similarity index 100% rename from tests/functional/name_styles.rc rename to tests/functional/n/name_styles.rc diff --git a/tests/functional/name_styles.txt b/tests/functional/n/name_styles.txt similarity index 100% rename from tests/functional/name_styles.txt rename to tests/functional/n/name_styles.txt diff --git a/tests/functional/namedtuple_member_inference.py b/tests/functional/n/namedtuple_member_inference.py similarity index 100% rename from tests/functional/namedtuple_member_inference.py rename to tests/functional/n/namedtuple_member_inference.py diff --git a/tests/functional/namedtuple_member_inference.txt b/tests/functional/n/namedtuple_member_inference.txt similarity index 100% rename from tests/functional/namedtuple_member_inference.txt rename to tests/functional/n/namedtuple_member_inference.txt diff --git a/tests/functional/names_in__all__.py b/tests/functional/n/names_in__all__.py similarity index 100% rename from tests/functional/names_in__all__.py rename to tests/functional/n/names_in__all__.py diff --git a/tests/functional/names_in__all__.txt b/tests/functional/n/names_in__all__.txt similarity index 100% rename from tests/functional/names_in__all__.txt rename to tests/functional/n/names_in__all__.txt diff --git a/tests/functional/nested_blocks_issue1088.py b/tests/functional/n/nested_blocks_issue1088.py similarity index 100% rename from tests/functional/nested_blocks_issue1088.py rename to tests/functional/n/nested_blocks_issue1088.py diff --git a/tests/functional/nested_blocks_issue1088.txt b/tests/functional/n/nested_blocks_issue1088.txt similarity index 100% rename from tests/functional/nested_blocks_issue1088.txt rename to tests/functional/n/nested_blocks_issue1088.txt diff --git a/tests/functional/nested_func_defined_in_loop.py b/tests/functional/n/nested_func_defined_in_loop.py similarity index 100% rename from tests/functional/nested_func_defined_in_loop.py rename to tests/functional/n/nested_func_defined_in_loop.py diff --git a/tests/functional/no_classmethod_decorator.py b/tests/functional/n/no_classmethod_decorator.py similarity index 100% rename from tests/functional/no_classmethod_decorator.py rename to tests/functional/n/no_classmethod_decorator.py diff --git a/tests/functional/no_classmethod_decorator.txt b/tests/functional/n/no_classmethod_decorator.txt similarity index 100% rename from tests/functional/no_classmethod_decorator.txt rename to tests/functional/n/no_classmethod_decorator.txt diff --git a/tests/functional/no_else_raise.py b/tests/functional/n/no_else_raise.py similarity index 100% rename from tests/functional/no_else_raise.py rename to tests/functional/n/no_else_raise.py diff --git a/tests/functional/no_else_raise.txt b/tests/functional/n/no_else_raise.txt similarity index 100% rename from tests/functional/no_else_raise.txt rename to tests/functional/n/no_else_raise.txt diff --git a/tests/functional/no_else_return.py b/tests/functional/n/no_else_return.py similarity index 100% rename from tests/functional/no_else_return.py rename to tests/functional/n/no_else_return.py diff --git a/tests/functional/no_else_return.txt b/tests/functional/n/no_else_return.txt similarity index 100% rename from tests/functional/no_else_return.txt rename to tests/functional/n/no_else_return.txt diff --git a/tests/functional/no_name_in_module.py b/tests/functional/n/no_name_in_module.py similarity index 100% rename from tests/functional/no_name_in_module.py rename to tests/functional/n/no_name_in_module.py diff --git a/tests/functional/no_name_in_module.txt b/tests/functional/n/no_name_in_module.txt similarity index 84% rename from tests/functional/no_name_in_module.txt rename to tests/functional/n/no_name_in_module.txt index 7dbc11c6cd..611746f905 100644 --- a/tests/functional/no_name_in_module.txt +++ b/tests/functional/n/no_name_in_module.txt @@ -10,5 +10,5 @@ no-name-in-module:34::No name 'anything' in module 'collections' no-name-in-module:44::No name 'indeed_missing' in module 'collections' no-name-in-module:49::No name 'emit' in module 'collections' no-name-in-module:60::No name 'emit2' in module 'collections' -no-name-in-module:65::No name 'lala' in module 'functional.no_self_use' -no-name-in-module:66::No name 'bla' in module 'functional.no_self_use' +no-name-in-module:65::No name 'lala' in module 'functional.n.no_self_use' +no-name-in-module:66::No name 'bla' in module 'functional.n.no_self_use' diff --git a/tests/functional/no_self_argument_py37.py b/tests/functional/n/no_self_argument_py37.py similarity index 100% rename from tests/functional/no_self_argument_py37.py rename to tests/functional/n/no_self_argument_py37.py diff --git a/tests/functional/no_self_argument_py37.rc b/tests/functional/n/no_self_argument_py37.rc similarity index 100% rename from tests/functional/no_self_argument_py37.rc rename to tests/functional/n/no_self_argument_py37.rc diff --git a/tests/functional/no_self_argument_py37.txt b/tests/functional/n/no_self_argument_py37.txt similarity index 100% rename from tests/functional/no_self_argument_py37.txt rename to tests/functional/n/no_self_argument_py37.txt diff --git a/tests/functional/no_self_use.py b/tests/functional/n/no_self_use.py similarity index 100% rename from tests/functional/no_self_use.py rename to tests/functional/n/no_self_use.py diff --git a/tests/functional/no_self_use.txt b/tests/functional/n/no_self_use.txt similarity index 100% rename from tests/functional/no_self_use.txt rename to tests/functional/n/no_self_use.txt diff --git a/tests/functional/no_self_use_py3.py b/tests/functional/n/no_self_use_py3.py similarity index 100% rename from tests/functional/no_self_use_py3.py rename to tests/functional/n/no_self_use_py3.py diff --git a/tests/functional/no_self_use_py3.rc b/tests/functional/n/no_self_use_py3.rc similarity index 100% rename from tests/functional/no_self_use_py3.rc rename to tests/functional/n/no_self_use_py3.rc diff --git a/tests/functional/no_self_use_py3.txt b/tests/functional/n/no_self_use_py3.txt similarity index 100% rename from tests/functional/no_self_use_py3.txt rename to tests/functional/n/no_self_use_py3.txt diff --git a/tests/functional/no_staticmethod_decorator.py b/tests/functional/n/no_staticmethod_decorator.py similarity index 100% rename from tests/functional/no_staticmethod_decorator.py rename to tests/functional/n/no_staticmethod_decorator.py diff --git a/tests/functional/no_staticmethod_decorator.txt b/tests/functional/n/no_staticmethod_decorator.txt similarity index 100% rename from tests/functional/no_staticmethod_decorator.txt rename to tests/functional/n/no_staticmethod_decorator.txt diff --git a/tests/functional/non_iterator_returned.py b/tests/functional/n/non_iterator_returned.py similarity index 100% rename from tests/functional/non_iterator_returned.py rename to tests/functional/n/non_iterator_returned.py diff --git a/tests/functional/non_iterator_returned.txt b/tests/functional/n/non_iterator_returned.txt similarity index 100% rename from tests/functional/non_iterator_returned.txt rename to tests/functional/n/non_iterator_returned.txt diff --git a/tests/functional/none_dunder_protocols_py36.py b/tests/functional/n/none_dunder_protocols_py36.py similarity index 100% rename from tests/functional/none_dunder_protocols_py36.py rename to tests/functional/n/none_dunder_protocols_py36.py diff --git a/tests/functional/none_dunder_protocols_py36.rc b/tests/functional/n/none_dunder_protocols_py36.rc similarity index 100% rename from tests/functional/none_dunder_protocols_py36.rc rename to tests/functional/n/none_dunder_protocols_py36.rc diff --git a/tests/functional/none_dunder_protocols_py36.txt b/tests/functional/n/none_dunder_protocols_py36.txt similarity index 100% rename from tests/functional/none_dunder_protocols_py36.txt rename to tests/functional/n/none_dunder_protocols_py36.txt diff --git a/tests/functional/nonexistent_operator.py b/tests/functional/n/nonexistent_operator.py similarity index 100% rename from tests/functional/nonexistent_operator.py rename to tests/functional/n/nonexistent_operator.py diff --git a/tests/functional/nonexistent_operator.txt b/tests/functional/n/nonexistent_operator.txt similarity index 100% rename from tests/functional/nonexistent_operator.txt rename to tests/functional/n/nonexistent_operator.txt diff --git a/tests/functional/nonlocal_and_global.py b/tests/functional/n/nonlocal_and_global.py similarity index 100% rename from tests/functional/nonlocal_and_global.py rename to tests/functional/n/nonlocal_and_global.py diff --git a/tests/functional/nonlocal_and_global.rc b/tests/functional/n/nonlocal_and_global.rc similarity index 100% rename from tests/functional/nonlocal_and_global.rc rename to tests/functional/n/nonlocal_and_global.rc diff --git a/tests/functional/nonlocal_and_global.txt b/tests/functional/n/nonlocal_and_global.txt similarity index 100% rename from tests/functional/nonlocal_and_global.txt rename to tests/functional/n/nonlocal_and_global.txt diff --git a/tests/functional/nonlocal_without_binding.py b/tests/functional/n/nonlocal_without_binding.py similarity index 100% rename from tests/functional/nonlocal_without_binding.py rename to tests/functional/n/nonlocal_without_binding.py diff --git a/tests/functional/nonlocal_without_binding.rc b/tests/functional/n/nonlocal_without_binding.rc similarity index 100% rename from tests/functional/nonlocal_without_binding.rc rename to tests/functional/n/nonlocal_without_binding.rc diff --git a/tests/functional/nonlocal_without_binding.txt b/tests/functional/n/nonlocal_without_binding.txt similarity index 100% rename from tests/functional/nonlocal_without_binding.txt rename to tests/functional/n/nonlocal_without_binding.txt diff --git a/tests/functional/not_async_context_manager.py b/tests/functional/n/not_async_context_manager.py similarity index 100% rename from tests/functional/not_async_context_manager.py rename to tests/functional/n/not_async_context_manager.py diff --git a/tests/functional/not_async_context_manager.rc b/tests/functional/n/not_async_context_manager.rc similarity index 100% rename from tests/functional/not_async_context_manager.rc rename to tests/functional/n/not_async_context_manager.rc diff --git a/tests/functional/not_async_context_manager.txt b/tests/functional/n/not_async_context_manager.txt similarity index 100% rename from tests/functional/not_async_context_manager.txt rename to tests/functional/n/not_async_context_manager.txt diff --git a/tests/functional/not_async_context_manager_py37.py b/tests/functional/n/not_async_context_manager_py37.py similarity index 100% rename from tests/functional/not_async_context_manager_py37.py rename to tests/functional/n/not_async_context_manager_py37.py diff --git a/tests/functional/not_async_context_manager_py37.rc b/tests/functional/n/not_async_context_manager_py37.rc similarity index 100% rename from tests/functional/not_async_context_manager_py37.rc rename to tests/functional/n/not_async_context_manager_py37.rc diff --git a/tests/functional/wrong_import_position_exclude_dunder_main.txt b/tests/functional/n/not_async_context_manager_py37.txt similarity index 100% rename from tests/functional/wrong_import_position_exclude_dunder_main.txt rename to tests/functional/n/not_async_context_manager_py37.txt diff --git a/tests/functional/not_callable.py b/tests/functional/n/not_callable.py similarity index 100% rename from tests/functional/not_callable.py rename to tests/functional/n/not_callable.py diff --git a/tests/functional/not_callable.txt b/tests/functional/n/not_callable.txt similarity index 100% rename from tests/functional/not_callable.txt rename to tests/functional/n/not_callable.txt diff --git a/tests/functional/not_context_manager.py b/tests/functional/n/not_context_manager.py similarity index 100% rename from tests/functional/not_context_manager.py rename to tests/functional/n/not_context_manager.py diff --git a/tests/functional/not_context_manager.txt b/tests/functional/n/not_context_manager.txt similarity index 100% rename from tests/functional/not_context_manager.txt rename to tests/functional/n/not_context_manager.txt diff --git a/tests/functional/not_in_loop.py b/tests/functional/n/not_in_loop.py similarity index 100% rename from tests/functional/not_in_loop.py rename to tests/functional/n/not_in_loop.py diff --git a/tests/functional/not_in_loop.txt b/tests/functional/n/not_in_loop.txt similarity index 100% rename from tests/functional/not_in_loop.txt rename to tests/functional/n/not_in_loop.txt diff --git a/tests/functional/o/__init__.py b/tests/functional/o/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/old_division_manually.py b/tests/functional/o/old_division_manually.py similarity index 100% rename from tests/functional/old_division_manually.py rename to tests/functional/o/old_division_manually.py diff --git a/tests/functional/old_division_manually.rc b/tests/functional/o/old_division_manually.rc similarity index 100% rename from tests/functional/old_division_manually.rc rename to tests/functional/o/old_division_manually.rc diff --git a/tests/functional/p/__init__.py b/tests/functional/p/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/postponed_evaluation_activated.py b/tests/functional/p/postponed_evaluation_activated.py similarity index 100% rename from tests/functional/postponed_evaluation_activated.py rename to tests/functional/p/postponed_evaluation_activated.py diff --git a/tests/functional/postponed_evaluation_activated.rc b/tests/functional/p/postponed_evaluation_activated.rc similarity index 100% rename from tests/functional/postponed_evaluation_activated.rc rename to tests/functional/p/postponed_evaluation_activated.rc diff --git a/tests/functional/p/postponed_evaluation_activated.txt b/tests/functional/p/postponed_evaluation_activated.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/postponed_evaluation_not_activated.py b/tests/functional/p/postponed_evaluation_not_activated.py similarity index 100% rename from tests/functional/postponed_evaluation_not_activated.py rename to tests/functional/p/postponed_evaluation_not_activated.py diff --git a/tests/functional/postponed_evaluation_not_activated.rc b/tests/functional/p/postponed_evaluation_not_activated.rc similarity index 100% rename from tests/functional/postponed_evaluation_not_activated.rc rename to tests/functional/p/postponed_evaluation_not_activated.rc diff --git a/tests/functional/postponed_evaluation_not_activated.txt b/tests/functional/p/postponed_evaluation_not_activated.txt similarity index 100% rename from tests/functional/postponed_evaluation_not_activated.txt rename to tests/functional/p/postponed_evaluation_not_activated.txt diff --git a/tests/functional/pragma_after_backslash.py b/tests/functional/p/pragma_after_backslash.py similarity index 100% rename from tests/functional/pragma_after_backslash.py rename to tests/functional/p/pragma_after_backslash.py diff --git a/tests/functional/preferred_module.py b/tests/functional/p/preferred_module.py similarity index 100% rename from tests/functional/preferred_module.py rename to tests/functional/p/preferred_module.py diff --git a/tests/functional/preferred_module.rc b/tests/functional/p/preferred_module.rc similarity index 100% rename from tests/functional/preferred_module.rc rename to tests/functional/p/preferred_module.rc diff --git a/tests/functional/preferred_module.txt b/tests/functional/p/preferred_module.txt similarity index 100% rename from tests/functional/preferred_module.txt rename to tests/functional/p/preferred_module.txt diff --git a/tests/functional/print_always_warns.py b/tests/functional/p/print_always_warns.py similarity index 100% rename from tests/functional/print_always_warns.py rename to tests/functional/p/print_always_warns.py diff --git a/tests/functional/print_always_warns.rc b/tests/functional/p/print_always_warns.rc similarity index 100% rename from tests/functional/print_always_warns.rc rename to tests/functional/p/print_always_warns.rc diff --git a/tests/functional/print_always_warns.txt b/tests/functional/p/print_always_warns.txt similarity index 100% rename from tests/functional/print_always_warns.txt rename to tests/functional/p/print_always_warns.txt diff --git a/tests/functional/property_with_parameters.py b/tests/functional/p/property_with_parameters.py similarity index 100% rename from tests/functional/property_with_parameters.py rename to tests/functional/p/property_with_parameters.py diff --git a/tests/functional/property_with_parameters.txt b/tests/functional/p/property_with_parameters.txt similarity index 100% rename from tests/functional/property_with_parameters.txt rename to tests/functional/p/property_with_parameters.txt diff --git a/tests/functional/protected_access_access_different_scopes.py b/tests/functional/p/protected_access_access_different_scopes.py similarity index 100% rename from tests/functional/protected_access_access_different_scopes.py rename to tests/functional/p/protected_access_access_different_scopes.py diff --git a/tests/functional/protected_access_access_different_scopes.rc b/tests/functional/p/protected_access_access_different_scopes.rc similarity index 100% rename from tests/functional/protected_access_access_different_scopes.rc rename to tests/functional/p/protected_access_access_different_scopes.rc diff --git a/tests/functional/protected_access_access_different_scopes.txt b/tests/functional/p/protected_access_access_different_scopes.txt similarity index 100% rename from tests/functional/protected_access_access_different_scopes.txt rename to tests/functional/p/protected_access_access_different_scopes.txt diff --git a/tests/functional/protocol_classes.py b/tests/functional/p/protocol_classes.py similarity index 100% rename from tests/functional/protocol_classes.py rename to tests/functional/p/protocol_classes.py diff --git a/tests/functional/protocol_classes.rc b/tests/functional/p/protocol_classes.rc similarity index 100% rename from tests/functional/protocol_classes.rc rename to tests/functional/p/protocol_classes.rc diff --git a/tests/functional/r/__init__.py b/tests/functional/r/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/raising_format_tuple.py b/tests/functional/r/raising_format_tuple.py similarity index 100% rename from tests/functional/raising_format_tuple.py rename to tests/functional/r/raising_format_tuple.py diff --git a/tests/functional/raising_format_tuple.txt b/tests/functional/r/raising_format_tuple.txt similarity index 100% rename from tests/functional/raising_format_tuple.txt rename to tests/functional/r/raising_format_tuple.txt diff --git a/tests/functional/raising_non_exception_py3.py b/tests/functional/r/raising_non_exception_py3.py similarity index 100% rename from tests/functional/raising_non_exception_py3.py rename to tests/functional/r/raising_non_exception_py3.py diff --git a/tests/functional/raising_non_exception_py3.rc b/tests/functional/r/raising_non_exception_py3.rc similarity index 100% rename from tests/functional/raising_non_exception_py3.rc rename to tests/functional/r/raising_non_exception_py3.rc diff --git a/tests/functional/raising_non_exception_py3.txt b/tests/functional/r/raising_non_exception_py3.txt similarity index 100% rename from tests/functional/raising_non_exception_py3.txt rename to tests/functional/r/raising_non_exception_py3.txt diff --git a/tests/functional/raising_self.py b/tests/functional/r/raising_self.py similarity index 100% rename from tests/functional/raising_self.py rename to tests/functional/r/raising_self.py diff --git a/tests/functional/r/raising_self.txt b/tests/functional/r/raising_self.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/recursion_error_2667.py b/tests/functional/r/recursion_error_2667.py similarity index 100% rename from tests/functional/recursion_error_2667.py rename to tests/functional/r/recursion_error_2667.py diff --git a/tests/functional/r/recursion_error_2667.txt b/tests/functional/r/recursion_error_2667.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/recursion_error_2836.py b/tests/functional/r/recursion_error_2836.py similarity index 100% rename from tests/functional/recursion_error_2836.py rename to tests/functional/r/recursion_error_2836.py diff --git a/tests/functional/recursion_error_2861.py b/tests/functional/r/recursion_error_2861.py similarity index 100% rename from tests/functional/recursion_error_2861.py rename to tests/functional/r/recursion_error_2861.py diff --git a/tests/functional/recursion_error_2899.py b/tests/functional/r/recursion_error_2899.py similarity index 100% rename from tests/functional/recursion_error_2899.py rename to tests/functional/r/recursion_error_2899.py diff --git a/tests/functional/recursion_error_2906.py b/tests/functional/r/recursion_error_2906.py similarity index 100% rename from tests/functional/recursion_error_2906.py rename to tests/functional/r/recursion_error_2906.py diff --git a/tests/functional/recursion_error_940.py b/tests/functional/r/recursion_error_940.py similarity index 100% rename from tests/functional/recursion_error_940.py rename to tests/functional/r/recursion_error_940.py diff --git a/tests/functional/recursion_error_crash.py b/tests/functional/r/recursion_error_crash.py similarity index 100% rename from tests/functional/recursion_error_crash.py rename to tests/functional/r/recursion_error_crash.py diff --git a/tests/functional/r/recursion_error_crash.txt b/tests/functional/r/recursion_error_crash.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/recursion_error_crash_2683.py b/tests/functional/r/recursion_error_crash_2683.py similarity index 100% rename from tests/functional/recursion_error_crash_2683.py rename to tests/functional/r/recursion_error_crash_2683.py diff --git a/tests/functional/r/recursion_error_crash_2683.txt b/tests/functional/r/recursion_error_crash_2683.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/recursion_error_crash_astroid_623.py b/tests/functional/r/recursion_error_crash_astroid_623.py similarity index 100% rename from tests/functional/recursion_error_crash_astroid_623.py rename to tests/functional/r/recursion_error_crash_astroid_623.py diff --git a/tests/functional/r/recursion_error_crash_astroid_623.txt b/tests/functional/r/recursion_error_crash_astroid_623.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/recursion_regression_2960.py b/tests/functional/r/recursion_regression_2960.py similarity index 100% rename from tests/functional/recursion_regression_2960.py rename to tests/functional/r/recursion_regression_2960.py diff --git a/tests/functional/redeclared_assigned_name.py b/tests/functional/r/redeclared_assigned_name.py similarity index 100% rename from tests/functional/redeclared_assigned_name.py rename to tests/functional/r/redeclared_assigned_name.py diff --git a/tests/functional/redeclared_assigned_name.txt b/tests/functional/r/redeclared_assigned_name.txt similarity index 100% rename from tests/functional/redeclared_assigned_name.txt rename to tests/functional/r/redeclared_assigned_name.txt diff --git a/tests/functional/redefine_in_handler.py b/tests/functional/r/redefine_in_handler.py similarity index 100% rename from tests/functional/redefine_in_handler.py rename to tests/functional/r/redefine_in_handler.py diff --git a/tests/functional/redefine_in_handler.rc b/tests/functional/r/redefine_in_handler.rc similarity index 100% rename from tests/functional/redefine_in_handler.rc rename to tests/functional/r/redefine_in_handler.rc diff --git a/tests/functional/redefine_in_handler.txt b/tests/functional/r/redefine_in_handler.txt similarity index 100% rename from tests/functional/redefine_in_handler.txt rename to tests/functional/r/redefine_in_handler.txt diff --git a/tests/functional/redefined_argument_from_local.py b/tests/functional/r/redefined_argument_from_local.py similarity index 100% rename from tests/functional/redefined_argument_from_local.py rename to tests/functional/r/redefined_argument_from_local.py diff --git a/tests/functional/redefined_argument_from_local.txt b/tests/functional/r/redefined_argument_from_local.txt similarity index 100% rename from tests/functional/redefined_argument_from_local.txt rename to tests/functional/r/redefined_argument_from_local.txt diff --git a/tests/functional/redefined_builtin.py b/tests/functional/r/redefined_builtin.py similarity index 100% rename from tests/functional/redefined_builtin.py rename to tests/functional/r/redefined_builtin.py diff --git a/tests/functional/redefined_builtin.txt b/tests/functional/r/redefined_builtin.txt similarity index 100% rename from tests/functional/redefined_builtin.txt rename to tests/functional/r/redefined_builtin.txt diff --git a/tests/functional/redundant_unittest_assert.py b/tests/functional/r/redundant_unittest_assert.py similarity index 100% rename from tests/functional/redundant_unittest_assert.py rename to tests/functional/r/redundant_unittest_assert.py diff --git a/tests/functional/redundant_unittest_assert.txt b/tests/functional/r/redundant_unittest_assert.txt similarity index 100% rename from tests/functional/redundant_unittest_assert.txt rename to tests/functional/r/redundant_unittest_assert.txt diff --git a/tests/functional/regression_1326_crash_uninferable.py b/tests/functional/r/regression_1326_crash_uninferable.py similarity index 100% rename from tests/functional/regression_1326_crash_uninferable.py rename to tests/functional/r/regression_1326_crash_uninferable.py diff --git a/tests/functional/regression_2443_duplicate_bases.py b/tests/functional/r/regression_2443_duplicate_bases.py similarity index 100% rename from tests/functional/regression_2443_duplicate_bases.py rename to tests/functional/r/regression_2443_duplicate_bases.py diff --git a/tests/functional/regression_2443_duplicate_bases.rc b/tests/functional/r/regression_2443_duplicate_bases.rc similarity index 100% rename from tests/functional/regression_2443_duplicate_bases.rc rename to tests/functional/r/regression_2443_duplicate_bases.rc diff --git a/tests/functional/regression_2937_ifexp.py b/tests/functional/r/regression_2937_ifexp.py similarity index 100% rename from tests/functional/regression_2937_ifexp.py rename to tests/functional/r/regression_2937_ifexp.py diff --git a/tests/functional/regression_no_value_for_parameter.py b/tests/functional/r/regression_no_value_for_parameter.py similarity index 100% rename from tests/functional/regression_no_value_for_parameter.py rename to tests/functional/r/regression_no_value_for_parameter.py diff --git a/tests/functional/r/regression_no_value_for_parameter.txt b/tests/functional/r/regression_no_value_for_parameter.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/reimported.py b/tests/functional/r/reimported.py similarity index 100% rename from tests/functional/reimported.py rename to tests/functional/r/reimported.py diff --git a/tests/functional/reimported.txt b/tests/functional/r/reimported.txt similarity index 100% rename from tests/functional/reimported.txt rename to tests/functional/r/reimported.txt diff --git a/tests/functional/repeated_keyword.py b/tests/functional/r/repeated_keyword.py similarity index 100% rename from tests/functional/repeated_keyword.py rename to tests/functional/r/repeated_keyword.py diff --git a/tests/functional/repeated_keyword.txt b/tests/functional/r/repeated_keyword.txt similarity index 100% rename from tests/functional/repeated_keyword.txt rename to tests/functional/r/repeated_keyword.txt diff --git a/tests/functional/return_in_init.py b/tests/functional/r/return_in_init.py similarity index 100% rename from tests/functional/return_in_init.py rename to tests/functional/r/return_in_init.py diff --git a/tests/functional/return_in_init.txt b/tests/functional/r/return_in_init.txt similarity index 100% rename from tests/functional/return_in_init.txt rename to tests/functional/r/return_in_init.txt diff --git a/tests/functional/return_outside_function.py b/tests/functional/r/return_outside_function.py similarity index 100% rename from tests/functional/return_outside_function.py rename to tests/functional/r/return_outside_function.py diff --git a/tests/functional/return_outside_function.txt b/tests/functional/r/return_outside_function.txt similarity index 100% rename from tests/functional/return_outside_function.txt rename to tests/functional/r/return_outside_function.txt diff --git a/tests/functional/reused_outer_loop_variable.py b/tests/functional/r/reused_outer_loop_variable.py similarity index 100% rename from tests/functional/reused_outer_loop_variable.py rename to tests/functional/r/reused_outer_loop_variable.py diff --git a/tests/functional/reused_outer_loop_variable.txt b/tests/functional/r/reused_outer_loop_variable.txt similarity index 100% rename from tests/functional/reused_outer_loop_variable.txt rename to tests/functional/r/reused_outer_loop_variable.txt diff --git a/tests/functional/reused_outer_loop_variable_py3.py b/tests/functional/r/reused_outer_loop_variable_py3.py similarity index 100% rename from tests/functional/reused_outer_loop_variable_py3.py rename to tests/functional/r/reused_outer_loop_variable_py3.py diff --git a/tests/functional/reused_outer_loop_variable_py3.rc b/tests/functional/r/reused_outer_loop_variable_py3.rc similarity index 100% rename from tests/functional/reused_outer_loop_variable_py3.rc rename to tests/functional/r/reused_outer_loop_variable_py3.rc diff --git a/tests/functional/reused_outer_loop_variable_py3.txt b/tests/functional/r/reused_outer_loop_variable_py3.txt similarity index 100% rename from tests/functional/reused_outer_loop_variable_py3.txt rename to tests/functional/r/reused_outer_loop_variable_py3.txt diff --git a/tests/functional/s/__init__.py b/tests/functional/s/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/self_assigning_variable.py b/tests/functional/s/self_assigning_variable.py similarity index 100% rename from tests/functional/self_assigning_variable.py rename to tests/functional/s/self_assigning_variable.py diff --git a/tests/functional/self_assigning_variable.txt b/tests/functional/s/self_assigning_variable.txt similarity index 100% rename from tests/functional/self_assigning_variable.txt rename to tests/functional/s/self_assigning_variable.txt diff --git a/tests/functional/self_cls_assignment.py b/tests/functional/s/self_cls_assignment.py similarity index 100% rename from tests/functional/self_cls_assignment.py rename to tests/functional/s/self_cls_assignment.py diff --git a/tests/functional/self_cls_assignment.txt b/tests/functional/s/self_cls_assignment.txt similarity index 100% rename from tests/functional/self_cls_assignment.txt rename to tests/functional/s/self_cls_assignment.txt diff --git a/tests/functional/signature_differs.py b/tests/functional/s/signature_differs.py similarity index 100% rename from tests/functional/signature_differs.py rename to tests/functional/s/signature_differs.py diff --git a/tests/functional/signature_differs.txt b/tests/functional/s/signature_differs.txt similarity index 100% rename from tests/functional/signature_differs.txt rename to tests/functional/s/signature_differs.txt diff --git a/tests/functional/simplifiable_if_expression.py b/tests/functional/s/simplifiable_if_expression.py similarity index 100% rename from tests/functional/simplifiable_if_expression.py rename to tests/functional/s/simplifiable_if_expression.py diff --git a/tests/functional/simplifiable_if_expression.txt b/tests/functional/s/simplifiable_if_expression.txt similarity index 100% rename from tests/functional/simplifiable_if_expression.txt rename to tests/functional/s/simplifiable_if_expression.txt diff --git a/tests/functional/simplifiable_if_statement.py b/tests/functional/s/simplifiable_if_statement.py similarity index 100% rename from tests/functional/simplifiable_if_statement.py rename to tests/functional/s/simplifiable_if_statement.py diff --git a/tests/functional/simplifiable_if_statement.txt b/tests/functional/s/simplifiable_if_statement.txt similarity index 100% rename from tests/functional/simplifiable_if_statement.txt rename to tests/functional/s/simplifiable_if_statement.txt diff --git a/tests/functional/simplify_chained_comparison.py b/tests/functional/s/simplify_chained_comparison.py similarity index 100% rename from tests/functional/simplify_chained_comparison.py rename to tests/functional/s/simplify_chained_comparison.py diff --git a/tests/functional/simplify_chained_comparison.txt b/tests/functional/s/simplify_chained_comparison.txt similarity index 100% rename from tests/functional/simplify_chained_comparison.txt rename to tests/functional/s/simplify_chained_comparison.txt diff --git a/tests/functional/singledispatch_functions.py b/tests/functional/s/singledispatch_functions.py similarity index 100% rename from tests/functional/singledispatch_functions.py rename to tests/functional/s/singledispatch_functions.py diff --git a/tests/functional/singledispatch_functions.rc b/tests/functional/s/singledispatch_functions.rc similarity index 100% rename from tests/functional/singledispatch_functions.rc rename to tests/functional/s/singledispatch_functions.rc diff --git a/tests/functional/singledispatch_functions.txt b/tests/functional/s/singledispatch_functions.txt similarity index 100% rename from tests/functional/singledispatch_functions.txt rename to tests/functional/s/singledispatch_functions.txt diff --git a/tests/functional/singledispatch_functions_py3.py b/tests/functional/s/singledispatch_functions_py3.py similarity index 100% rename from tests/functional/singledispatch_functions_py3.py rename to tests/functional/s/singledispatch_functions_py3.py diff --git a/tests/functional/singledispatch_functions_py3.rc b/tests/functional/s/singledispatch_functions_py3.rc similarity index 100% rename from tests/functional/singledispatch_functions_py3.rc rename to tests/functional/s/singledispatch_functions_py3.rc diff --git a/tests/functional/singledispatch_functions_py3.txt b/tests/functional/s/singledispatch_functions_py3.txt similarity index 100% rename from tests/functional/singledispatch_functions_py3.txt rename to tests/functional/s/singledispatch_functions_py3.txt diff --git a/tests/functional/singleton_comparison.py b/tests/functional/s/singleton_comparison.py similarity index 100% rename from tests/functional/singleton_comparison.py rename to tests/functional/s/singleton_comparison.py diff --git a/tests/functional/singleton_comparison.txt b/tests/functional/s/singleton_comparison.txt similarity index 100% rename from tests/functional/singleton_comparison.txt rename to tests/functional/s/singleton_comparison.txt diff --git a/tests/functional/slots_checks.py b/tests/functional/s/slots_checks.py similarity index 100% rename from tests/functional/slots_checks.py rename to tests/functional/s/slots_checks.py diff --git a/tests/functional/slots_checks.txt b/tests/functional/s/slots_checks.txt similarity index 100% rename from tests/functional/slots_checks.txt rename to tests/functional/s/slots_checks.txt diff --git a/tests/functional/socketerror_import.py b/tests/functional/s/socketerror_import.py similarity index 100% rename from tests/functional/socketerror_import.py rename to tests/functional/s/socketerror_import.py diff --git a/tests/functional/star_needs_assignment_target.py b/tests/functional/s/star_needs_assignment_target.py similarity index 100% rename from tests/functional/star_needs_assignment_target.py rename to tests/functional/s/star_needs_assignment_target.py diff --git a/tests/functional/star_needs_assignment_target.rc b/tests/functional/s/star_needs_assignment_target.rc similarity index 100% rename from tests/functional/star_needs_assignment_target.rc rename to tests/functional/s/star_needs_assignment_target.rc diff --git a/tests/functional/star_needs_assignment_target.txt b/tests/functional/s/star_needs_assignment_target.txt similarity index 100% rename from tests/functional/star_needs_assignment_target.txt rename to tests/functional/s/star_needs_assignment_target.txt diff --git a/tests/functional/star_needs_assignment_target_py35.py b/tests/functional/s/star_needs_assignment_target_py35.py similarity index 100% rename from tests/functional/star_needs_assignment_target_py35.py rename to tests/functional/s/star_needs_assignment_target_py35.py diff --git a/tests/functional/star_needs_assignment_target_py35.rc b/tests/functional/s/star_needs_assignment_target_py35.rc similarity index 100% rename from tests/functional/star_needs_assignment_target_py35.rc rename to tests/functional/s/star_needs_assignment_target_py35.rc diff --git a/tests/functional/star_needs_assignment_target_py35.txt b/tests/functional/s/star_needs_assignment_target_py35.txt similarity index 100% rename from tests/functional/star_needs_assignment_target_py35.txt rename to tests/functional/s/star_needs_assignment_target_py35.txt diff --git a/tests/functional/statement_without_effect.py b/tests/functional/s/statement_without_effect.py similarity index 100% rename from tests/functional/statement_without_effect.py rename to tests/functional/s/statement_without_effect.py diff --git a/tests/functional/statement_without_effect.txt b/tests/functional/s/statement_without_effect.txt similarity index 100% rename from tests/functional/statement_without_effect.txt rename to tests/functional/s/statement_without_effect.txt diff --git a/tests/functional/statement_without_effect_py36.py b/tests/functional/s/statement_without_effect_py36.py similarity index 100% rename from tests/functional/statement_without_effect_py36.py rename to tests/functional/s/statement_without_effect_py36.py diff --git a/tests/functional/statement_without_effect_py36.rc b/tests/functional/s/statement_without_effect_py36.rc similarity index 100% rename from tests/functional/statement_without_effect_py36.rc rename to tests/functional/s/statement_without_effect_py36.rc diff --git a/tests/functional/statement_without_effect_py36.txt b/tests/functional/s/statement_without_effect_py36.txt similarity index 100% rename from tests/functional/statement_without_effect_py36.txt rename to tests/functional/s/statement_without_effect_py36.txt diff --git a/tests/functional/stop_iteration_inside_generator.py b/tests/functional/s/stop_iteration_inside_generator.py similarity index 100% rename from tests/functional/stop_iteration_inside_generator.py rename to tests/functional/s/stop_iteration_inside_generator.py diff --git a/tests/functional/stop_iteration_inside_generator.rc b/tests/functional/s/stop_iteration_inside_generator.rc similarity index 100% rename from tests/functional/stop_iteration_inside_generator.rc rename to tests/functional/s/stop_iteration_inside_generator.rc diff --git a/tests/functional/stop_iteration_inside_generator.txt b/tests/functional/s/stop_iteration_inside_generator.txt similarity index 100% rename from tests/functional/stop_iteration_inside_generator.txt rename to tests/functional/s/stop_iteration_inside_generator.txt diff --git a/tests/functional/string_formatting.py b/tests/functional/s/string_formatting.py similarity index 100% rename from tests/functional/string_formatting.py rename to tests/functional/s/string_formatting.py diff --git a/tests/functional/string_formatting.txt b/tests/functional/s/string_formatting.txt similarity index 100% rename from tests/functional/string_formatting.txt rename to tests/functional/s/string_formatting.txt diff --git a/tests/functional/string_formatting_disable.py b/tests/functional/s/string_formatting_disable.py similarity index 100% rename from tests/functional/string_formatting_disable.py rename to tests/functional/s/string_formatting_disable.py diff --git a/tests/functional/string_formatting_disable.rc b/tests/functional/s/string_formatting_disable.rc similarity index 100% rename from tests/functional/string_formatting_disable.rc rename to tests/functional/s/string_formatting_disable.rc diff --git a/tests/functional/string_formatting_disable.txt b/tests/functional/s/string_formatting_disable.txt similarity index 100% rename from tests/functional/string_formatting_disable.txt rename to tests/functional/s/string_formatting_disable.txt diff --git a/tests/functional/string_formatting_failed_inference.py b/tests/functional/s/string_formatting_failed_inference.py similarity index 100% rename from tests/functional/string_formatting_failed_inference.py rename to tests/functional/s/string_formatting_failed_inference.py diff --git a/tests/functional/string_formatting_failed_inference_py35.py b/tests/functional/s/string_formatting_failed_inference_py35.py similarity index 100% rename from tests/functional/string_formatting_failed_inference_py35.py rename to tests/functional/s/string_formatting_failed_inference_py35.py diff --git a/tests/functional/string_formatting_failed_inference_py35.rc b/tests/functional/s/string_formatting_failed_inference_py35.rc similarity index 100% rename from tests/functional/string_formatting_failed_inference_py35.rc rename to tests/functional/s/string_formatting_failed_inference_py35.rc diff --git a/tests/functional/string_formatting_py27.py b/tests/functional/s/string_formatting_py27.py similarity index 100% rename from tests/functional/string_formatting_py27.py rename to tests/functional/s/string_formatting_py27.py diff --git a/tests/functional/string_formatting_py27.rc b/tests/functional/s/string_formatting_py27.rc similarity index 100% rename from tests/functional/string_formatting_py27.rc rename to tests/functional/s/string_formatting_py27.rc diff --git a/tests/functional/string_formatting_py27.txt b/tests/functional/s/string_formatting_py27.txt similarity index 100% rename from tests/functional/string_formatting_py27.txt rename to tests/functional/s/string_formatting_py27.txt diff --git a/tests/functional/string_formatting_py3.py b/tests/functional/s/string_formatting_py3.py similarity index 100% rename from tests/functional/string_formatting_py3.py rename to tests/functional/s/string_formatting_py3.py diff --git a/tests/functional/string_formatting_py3.rc b/tests/functional/s/string_formatting_py3.rc similarity index 100% rename from tests/functional/string_formatting_py3.rc rename to tests/functional/s/string_formatting_py3.rc diff --git a/tests/functional/string_formatting_py3.txt b/tests/functional/s/string_formatting_py3.txt similarity index 100% rename from tests/functional/string_formatting_py3.txt rename to tests/functional/s/string_formatting_py3.txt diff --git a/tests/functional/subprocess_popen_preexec_fn.py b/tests/functional/s/subprocess_popen_preexec_fn.py similarity index 100% rename from tests/functional/subprocess_popen_preexec_fn.py rename to tests/functional/s/subprocess_popen_preexec_fn.py diff --git a/tests/functional/subprocess_popen_preexec_fn.txt b/tests/functional/s/subprocess_popen_preexec_fn.txt similarity index 100% rename from tests/functional/subprocess_popen_preexec_fn.txt rename to tests/functional/s/subprocess_popen_preexec_fn.txt diff --git a/tests/functional/subprocess_run_check35.py b/tests/functional/s/subprocess_run_check35.py similarity index 100% rename from tests/functional/subprocess_run_check35.py rename to tests/functional/s/subprocess_run_check35.py diff --git a/tests/functional/subprocess_run_check35.rc b/tests/functional/s/subprocess_run_check35.rc similarity index 100% rename from tests/functional/subprocess_run_check35.rc rename to tests/functional/s/subprocess_run_check35.rc diff --git a/tests/functional/subprocess_run_check35.txt b/tests/functional/s/subprocess_run_check35.txt similarity index 100% rename from tests/functional/subprocess_run_check35.txt rename to tests/functional/s/subprocess_run_check35.txt diff --git a/tests/functional/super_checks.py b/tests/functional/s/super_checks.py similarity index 100% rename from tests/functional/super_checks.py rename to tests/functional/s/super_checks.py diff --git a/tests/functional/super_checks.txt b/tests/functional/s/super_checks.txt similarity index 100% rename from tests/functional/super_checks.txt rename to tests/functional/s/super_checks.txt diff --git a/tests/functional/superfluous_parens.py b/tests/functional/s/superfluous_parens.py similarity index 100% rename from tests/functional/superfluous_parens.py rename to tests/functional/s/superfluous_parens.py diff --git a/tests/functional/superfluous_parens.txt b/tests/functional/s/superfluous_parens.txt similarity index 100% rename from tests/functional/superfluous_parens.txt rename to tests/functional/s/superfluous_parens.txt diff --git a/tests/functional/suspicious_str_strip_call.py b/tests/functional/s/suspicious_str_strip_call.py similarity index 100% rename from tests/functional/suspicious_str_strip_call.py rename to tests/functional/s/suspicious_str_strip_call.py diff --git a/tests/functional/suspicious_str_strip_call.rc b/tests/functional/s/suspicious_str_strip_call.rc similarity index 100% rename from tests/functional/suspicious_str_strip_call.rc rename to tests/functional/s/suspicious_str_strip_call.rc diff --git a/tests/functional/suspicious_str_strip_call.txt b/tests/functional/s/suspicious_str_strip_call.txt similarity index 100% rename from tests/functional/suspicious_str_strip_call.txt rename to tests/functional/s/suspicious_str_strip_call.txt diff --git a/tests/functional/suspicious_str_strip_call_py3.py b/tests/functional/s/suspicious_str_strip_call_py3.py similarity index 100% rename from tests/functional/suspicious_str_strip_call_py3.py rename to tests/functional/s/suspicious_str_strip_call_py3.py diff --git a/tests/functional/suspicious_str_strip_call_py3.rc b/tests/functional/s/suspicious_str_strip_call_py3.rc similarity index 100% rename from tests/functional/suspicious_str_strip_call_py3.rc rename to tests/functional/s/suspicious_str_strip_call_py3.rc diff --git a/tests/functional/suspicious_str_strip_call_py3.txt b/tests/functional/s/suspicious_str_strip_call_py3.txt similarity index 100% rename from tests/functional/suspicious_str_strip_call_py3.txt rename to tests/functional/s/suspicious_str_strip_call_py3.txt diff --git a/tests/functional/syntax_error_jython.py b/tests/functional/s/syntax_error_jython.py similarity index 100% rename from tests/functional/syntax_error_jython.py rename to tests/functional/s/syntax_error_jython.py diff --git a/tests/functional/syntax_error_jython.rc b/tests/functional/s/syntax_error_jython.rc similarity index 100% rename from tests/functional/syntax_error_jython.rc rename to tests/functional/s/syntax_error_jython.rc diff --git a/tests/functional/syntax_error_jython.txt b/tests/functional/s/syntax_error_jython.txt similarity index 100% rename from tests/functional/syntax_error_jython.txt rename to tests/functional/s/syntax_error_jython.txt diff --git a/tests/functional/sys_stream_regression_1004.py b/tests/functional/s/sys_stream_regression_1004.py similarity index 100% rename from tests/functional/sys_stream_regression_1004.py rename to tests/functional/s/sys_stream_regression_1004.py diff --git a/tests/functional/sys_stream_regression_1004.rc b/tests/functional/s/sys_stream_regression_1004.rc similarity index 100% rename from tests/functional/sys_stream_regression_1004.rc rename to tests/functional/s/sys_stream_regression_1004.rc diff --git a/tests/functional/sys_stream_regression_1004.txt b/tests/functional/s/sys_stream_regression_1004.txt similarity index 100% rename from tests/functional/sys_stream_regression_1004.txt rename to tests/functional/s/sys_stream_regression_1004.txt diff --git a/tests/functional/t/__init__.py b/tests/functional/t/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/ternary.py b/tests/functional/t/ternary.py similarity index 100% rename from tests/functional/ternary.py rename to tests/functional/t/ternary.py diff --git a/tests/functional/ternary.txt b/tests/functional/t/ternary.txt similarity index 100% rename from tests/functional/ternary.txt rename to tests/functional/t/ternary.txt diff --git a/tests/functional/test_compile.py b/tests/functional/t/test_compile.py similarity index 100% rename from tests/functional/test_compile.py rename to tests/functional/t/test_compile.py diff --git a/tests/functional/tokenize_error.py b/tests/functional/t/tokenize_error.py similarity index 100% rename from tests/functional/tokenize_error.py rename to tests/functional/t/tokenize_error.py diff --git a/tests/functional/tokenize_error.rc b/tests/functional/t/tokenize_error.rc similarity index 100% rename from tests/functional/tokenize_error.rc rename to tests/functional/t/tokenize_error.rc diff --git a/tests/functional/tokenize_error.txt b/tests/functional/t/tokenize_error.txt similarity index 100% rename from tests/functional/tokenize_error.txt rename to tests/functional/t/tokenize_error.txt diff --git a/tests/functional/tokenize_error_jython.py b/tests/functional/t/tokenize_error_jython.py similarity index 100% rename from tests/functional/tokenize_error_jython.py rename to tests/functional/t/tokenize_error_jython.py diff --git a/tests/functional/tokenize_error_jython.rc b/tests/functional/t/tokenize_error_jython.rc similarity index 100% rename from tests/functional/tokenize_error_jython.rc rename to tests/functional/t/tokenize_error_jython.rc diff --git a/tests/functional/tokenize_error_jython.txt b/tests/functional/t/tokenize_error_jython.txt similarity index 100% rename from tests/functional/tokenize_error_jython.txt rename to tests/functional/t/tokenize_error_jython.txt diff --git a/tests/functional/trailing_comma_tuple.py b/tests/functional/t/trailing_comma_tuple.py similarity index 100% rename from tests/functional/trailing_comma_tuple.py rename to tests/functional/t/trailing_comma_tuple.py diff --git a/tests/functional/trailing_comma_tuple.rc b/tests/functional/t/trailing_comma_tuple.rc similarity index 100% rename from tests/functional/trailing_comma_tuple.rc rename to tests/functional/t/trailing_comma_tuple.rc diff --git a/tests/functional/trailing_comma_tuple.txt b/tests/functional/t/trailing_comma_tuple.txt similarity index 100% rename from tests/functional/trailing_comma_tuple.txt rename to tests/functional/t/trailing_comma_tuple.txt diff --git a/tests/functional/trailing_newlines.py b/tests/functional/t/trailing_newlines.py similarity index 100% rename from tests/functional/trailing_newlines.py rename to tests/functional/t/trailing_newlines.py diff --git a/tests/functional/trailing_newlines.txt b/tests/functional/t/trailing_newlines.txt similarity index 100% rename from tests/functional/trailing_newlines.txt rename to tests/functional/t/trailing_newlines.txt diff --git a/tests/functional/trailing_whitespaces.py b/tests/functional/t/trailing_whitespaces.py similarity index 100% rename from tests/functional/trailing_whitespaces.py rename to tests/functional/t/trailing_whitespaces.py diff --git a/tests/functional/trailing_whitespaces.txt b/tests/functional/t/trailing_whitespaces.txt similarity index 100% rename from tests/functional/trailing_whitespaces.txt rename to tests/functional/t/trailing_whitespaces.txt diff --git a/tests/functional/try_except_raise.py b/tests/functional/t/try_except_raise.py similarity index 100% rename from tests/functional/try_except_raise.py rename to tests/functional/t/try_except_raise.py diff --git a/tests/functional/try_except_raise.txt b/tests/functional/t/try_except_raise.txt similarity index 100% rename from tests/functional/try_except_raise.txt rename to tests/functional/t/try_except_raise.txt diff --git a/tests/functional/try_except_raise_crash.py b/tests/functional/t/try_except_raise_crash.py similarity index 100% rename from tests/functional/try_except_raise_crash.py rename to tests/functional/t/try_except_raise_crash.py diff --git a/tests/functional/try_except_raise_crash.txt b/tests/functional/t/try_except_raise_crash.txt similarity index 100% rename from tests/functional/try_except_raise_crash.txt rename to tests/functional/t/try_except_raise_crash.txt diff --git a/tests/functional/typing_use.py b/tests/functional/t/typing_use.py similarity index 100% rename from tests/functional/typing_use.py rename to tests/functional/t/typing_use.py diff --git a/tests/functional/typing_use.rc b/tests/functional/t/typing_use.rc similarity index 100% rename from tests/functional/typing_use.rc rename to tests/functional/t/typing_use.rc diff --git a/tests/functional/typing_use.txt b/tests/functional/t/typing_use.txt similarity index 100% rename from tests/functional/typing_use.txt rename to tests/functional/t/typing_use.txt diff --git a/tests/functional/too/__init__.py b/tests/functional/too/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/too_few_public_methods.py b/tests/functional/too/too_few_public_methods.py similarity index 100% rename from tests/functional/too_few_public_methods.py rename to tests/functional/too/too_few_public_methods.py diff --git a/tests/functional/too_few_public_methods.txt b/tests/functional/too/too_few_public_methods.txt similarity index 100% rename from tests/functional/too_few_public_methods.txt rename to tests/functional/too/too_few_public_methods.txt diff --git a/tests/functional/too_few_public_methods_37.py b/tests/functional/too/too_few_public_methods_37.py similarity index 100% rename from tests/functional/too_few_public_methods_37.py rename to tests/functional/too/too_few_public_methods_37.py diff --git a/tests/functional/too_few_public_methods_37.rc b/tests/functional/too/too_few_public_methods_37.rc similarity index 100% rename from tests/functional/too_few_public_methods_37.rc rename to tests/functional/too/too_few_public_methods_37.rc diff --git a/tests/functional/too/too_few_public_methods_37.txt b/tests/functional/too/too_few_public_methods_37.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/too_many_ancestors.py b/tests/functional/too/too_many_ancestors.py similarity index 100% rename from tests/functional/too_many_ancestors.py rename to tests/functional/too/too_many_ancestors.py diff --git a/tests/functional/too_many_ancestors.txt b/tests/functional/too/too_many_ancestors.txt similarity index 100% rename from tests/functional/too_many_ancestors.txt rename to tests/functional/too/too_many_ancestors.txt diff --git a/tests/functional/too_many_arguments.py b/tests/functional/too/too_many_arguments.py similarity index 100% rename from tests/functional/too_many_arguments.py rename to tests/functional/too/too_many_arguments.py diff --git a/tests/functional/too_many_arguments.txt b/tests/functional/too/too_many_arguments.txt similarity index 100% rename from tests/functional/too_many_arguments.txt rename to tests/functional/too/too_many_arguments.txt diff --git a/tests/functional/too_many_arguments_issue_1045.py b/tests/functional/too/too_many_arguments_issue_1045.py similarity index 100% rename from tests/functional/too_many_arguments_issue_1045.py rename to tests/functional/too/too_many_arguments_issue_1045.py diff --git a/tests/functional/too_many_arguments_issue_1045.rc b/tests/functional/too/too_many_arguments_issue_1045.rc similarity index 100% rename from tests/functional/too_many_arguments_issue_1045.rc rename to tests/functional/too/too_many_arguments_issue_1045.rc diff --git a/tests/functional/too/too_many_arguments_issue_1045.txt b/tests/functional/too/too_many_arguments_issue_1045.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/too_many_boolean_expressions.py b/tests/functional/too/too_many_boolean_expressions.py similarity index 100% rename from tests/functional/too_many_boolean_expressions.py rename to tests/functional/too/too_many_boolean_expressions.py diff --git a/tests/functional/too_many_boolean_expressions.txt b/tests/functional/too/too_many_boolean_expressions.txt similarity index 100% rename from tests/functional/too_many_boolean_expressions.txt rename to tests/functional/too/too_many_boolean_expressions.txt diff --git a/tests/functional/too_many_branches.py b/tests/functional/too/too_many_branches.py similarity index 100% rename from tests/functional/too_many_branches.py rename to tests/functional/too/too_many_branches.py diff --git a/tests/functional/too_many_branches.txt b/tests/functional/too/too_many_branches.txt similarity index 100% rename from tests/functional/too_many_branches.txt rename to tests/functional/too/too_many_branches.txt diff --git a/tests/functional/too_many_instance_attributes.py b/tests/functional/too/too_many_instance_attributes.py similarity index 100% rename from tests/functional/too_many_instance_attributes.py rename to tests/functional/too/too_many_instance_attributes.py diff --git a/tests/functional/too_many_instance_attributes.txt b/tests/functional/too/too_many_instance_attributes.txt similarity index 100% rename from tests/functional/too_many_instance_attributes.txt rename to tests/functional/too/too_many_instance_attributes.txt diff --git a/tests/functional/too_many_lines.py b/tests/functional/too/too_many_lines.py similarity index 100% rename from tests/functional/too_many_lines.py rename to tests/functional/too/too_many_lines.py diff --git a/tests/functional/too_many_lines.txt b/tests/functional/too/too_many_lines.txt similarity index 100% rename from tests/functional/too_many_lines.txt rename to tests/functional/too/too_many_lines.txt diff --git a/tests/functional/too_many_lines_disabled.py b/tests/functional/too/too_many_lines_disabled.py similarity index 100% rename from tests/functional/too_many_lines_disabled.py rename to tests/functional/too/too_many_lines_disabled.py diff --git a/tests/functional/too_many_locals.py b/tests/functional/too/too_many_locals.py similarity index 100% rename from tests/functional/too_many_locals.py rename to tests/functional/too/too_many_locals.py diff --git a/tests/functional/too_many_locals.txt b/tests/functional/too/too_many_locals.txt similarity index 100% rename from tests/functional/too_many_locals.txt rename to tests/functional/too/too_many_locals.txt diff --git a/tests/functional/too_many_nested_blocks.py b/tests/functional/too/too_many_nested_blocks.py similarity index 100% rename from tests/functional/too_many_nested_blocks.py rename to tests/functional/too/too_many_nested_blocks.py diff --git a/tests/functional/too_many_nested_blocks.txt b/tests/functional/too/too_many_nested_blocks.txt similarity index 100% rename from tests/functional/too_many_nested_blocks.txt rename to tests/functional/too/too_many_nested_blocks.txt diff --git a/tests/functional/too_many_public_methods.py b/tests/functional/too/too_many_public_methods.py similarity index 100% rename from tests/functional/too_many_public_methods.py rename to tests/functional/too/too_many_public_methods.py diff --git a/tests/functional/too_many_public_methods.txt b/tests/functional/too/too_many_public_methods.txt similarity index 100% rename from tests/functional/too_many_public_methods.txt rename to tests/functional/too/too_many_public_methods.txt diff --git a/tests/functional/too_many_return_statements.py b/tests/functional/too/too_many_return_statements.py similarity index 100% rename from tests/functional/too_many_return_statements.py rename to tests/functional/too/too_many_return_statements.py diff --git a/tests/functional/too_many_return_statements.txt b/tests/functional/too/too_many_return_statements.txt similarity index 100% rename from tests/functional/too_many_return_statements.txt rename to tests/functional/too/too_many_return_statements.txt diff --git a/tests/functional/too_many_star_expressions.py b/tests/functional/too/too_many_star_expressions.py similarity index 100% rename from tests/functional/too_many_star_expressions.py rename to tests/functional/too/too_many_star_expressions.py diff --git a/tests/functional/too_many_star_expressions.rc b/tests/functional/too/too_many_star_expressions.rc similarity index 100% rename from tests/functional/too_many_star_expressions.rc rename to tests/functional/too/too_many_star_expressions.rc diff --git a/tests/functional/too_many_star_expressions.txt b/tests/functional/too/too_many_star_expressions.txt similarity index 100% rename from tests/functional/too_many_star_expressions.txt rename to tests/functional/too/too_many_star_expressions.txt diff --git a/tests/functional/too_many_statements.py b/tests/functional/too/too_many_statements.py similarity index 100% rename from tests/functional/too_many_statements.py rename to tests/functional/too/too_many_statements.py diff --git a/tests/functional/too_many_statements.txt b/tests/functional/too/too_many_statements.txt similarity index 100% rename from tests/functional/too_many_statements.txt rename to tests/functional/too/too_many_statements.txt diff --git a/tests/functional/u/__init__.py b/tests/functional/u/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/unbalanced_tuple_unpacking.py b/tests/functional/u/unbalanced_tuple_unpacking.py similarity index 98% rename from tests/functional/unbalanced_tuple_unpacking.py rename to tests/functional/u/unbalanced_tuple_unpacking.py index afa217f40c..d3887f4f35 100644 --- a/tests/functional/unbalanced_tuple_unpacking.py +++ b/tests/functional/u/unbalanced_tuple_unpacking.py @@ -1,6 +1,6 @@ """Check possible unbalanced tuple unpacking """ from __future__ import absolute_import -from functional.unpacking import unpack +from functional.u.unpacking import unpack # pylint: disable=using-constant-test, useless-object-inheritance diff --git a/tests/functional/unbalanced_tuple_unpacking.txt b/tests/functional/u/unbalanced_tuple_unpacking.txt similarity index 80% rename from tests/functional/unbalanced_tuple_unpacking.txt rename to tests/functional/u/unbalanced_tuple_unpacking.txt index e904209e5f..af6a26602d 100644 --- a/tests/functional/unbalanced_tuple_unpacking.txt +++ b/tests/functional/u/unbalanced_tuple_unpacking.txt @@ -2,5 +2,5 @@ unbalanced-tuple-unpacking:9:do_stuff:"Possible unbalanced tuple unpacking with unbalanced-tuple-unpacking:14:do_stuff1:"Possible unbalanced tuple unpacking with sequence [1, 2, 3]: left side has 2 label(s), right side has 3 value(s)" unbalanced-tuple-unpacking:19:do_stuff2:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)" unbalanced-tuple-unpacking:24:do_stuff3:"Possible unbalanced tuple unpacking with sequence (1, 2, 3): left side has 2 label(s), right side has 3 value(s)" -unbalanced-tuple-unpacking:69:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.unpacking: left side has 2 label(s), right side has 3 value(s)" -unbalanced-tuple-unpacking:81:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.unpacking: left side has 2 label(s), right side has 3 value(s)" +unbalanced-tuple-unpacking:69:do_stuff9:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)" +unbalanced-tuple-unpacking:81:UnbalancedUnpacking.test:"Possible unbalanced tuple unpacking with sequence defined at line 7 of functional.u.unpacking: left side has 2 label(s), right side has 3 value(s)" diff --git a/tests/functional/unbalanced_tuple_unpacking_py30.py b/tests/functional/u/unbalanced_tuple_unpacking_py30.py similarity index 100% rename from tests/functional/unbalanced_tuple_unpacking_py30.py rename to tests/functional/u/unbalanced_tuple_unpacking_py30.py diff --git a/tests/functional/unbalanced_tuple_unpacking_py30.rc b/tests/functional/u/unbalanced_tuple_unpacking_py30.rc similarity index 100% rename from tests/functional/unbalanced_tuple_unpacking_py30.rc rename to tests/functional/u/unbalanced_tuple_unpacking_py30.rc diff --git a/tests/functional/undefined_loop_variable.py b/tests/functional/u/undefined_loop_variable.py similarity index 100% rename from tests/functional/undefined_loop_variable.py rename to tests/functional/u/undefined_loop_variable.py diff --git a/tests/functional/undefined_loop_variable.txt b/tests/functional/u/undefined_loop_variable.txt similarity index 100% rename from tests/functional/undefined_loop_variable.txt rename to tests/functional/u/undefined_loop_variable.txt diff --git a/tests/functional/undefined_variable.py b/tests/functional/u/undefined_variable.py similarity index 100% rename from tests/functional/undefined_variable.py rename to tests/functional/u/undefined_variable.py diff --git a/tests/functional/undefined_variable.txt b/tests/functional/u/undefined_variable.txt similarity index 100% rename from tests/functional/undefined_variable.txt rename to tests/functional/u/undefined_variable.txt diff --git a/tests/functional/undefined_variable_py30.py b/tests/functional/u/undefined_variable_py30.py similarity index 100% rename from tests/functional/undefined_variable_py30.py rename to tests/functional/u/undefined_variable_py30.py diff --git a/tests/functional/undefined_variable_py30.rc b/tests/functional/u/undefined_variable_py30.rc similarity index 100% rename from tests/functional/undefined_variable_py30.rc rename to tests/functional/u/undefined_variable_py30.rc diff --git a/tests/functional/undefined_variable_py30.txt b/tests/functional/u/undefined_variable_py30.txt similarity index 100% rename from tests/functional/undefined_variable_py30.txt rename to tests/functional/u/undefined_variable_py30.txt diff --git a/tests/functional/unexpected_special_method_signature.py b/tests/functional/u/unexpected_special_method_signature.py similarity index 100% rename from tests/functional/unexpected_special_method_signature.py rename to tests/functional/u/unexpected_special_method_signature.py diff --git a/tests/functional/unexpected_special_method_signature.txt b/tests/functional/u/unexpected_special_method_signature.txt similarity index 100% rename from tests/functional/unexpected_special_method_signature.txt rename to tests/functional/u/unexpected_special_method_signature.txt diff --git a/tests/functional/ungrouped_imports.py b/tests/functional/u/ungrouped_imports.py similarity index 100% rename from tests/functional/ungrouped_imports.py rename to tests/functional/u/ungrouped_imports.py diff --git a/tests/functional/ungrouped_imports.txt b/tests/functional/u/ungrouped_imports.txt similarity index 100% rename from tests/functional/ungrouped_imports.txt rename to tests/functional/u/ungrouped_imports.txt diff --git a/tests/functional/ungrouped_imports_isort_compatible.py b/tests/functional/u/ungrouped_imports_isort_compatible.py similarity index 100% rename from tests/functional/ungrouped_imports_isort_compatible.py rename to tests/functional/u/ungrouped_imports_isort_compatible.py diff --git a/tests/functional/u/ungrouped_imports_isort_compatible.txt b/tests/functional/u/ungrouped_imports_isort_compatible.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/unhashable_dict_key.py b/tests/functional/u/unhashable_dict_key.py similarity index 100% rename from tests/functional/unhashable_dict_key.py rename to tests/functional/u/unhashable_dict_key.py diff --git a/tests/functional/unhashable_dict_key.txt b/tests/functional/u/unhashable_dict_key.txt similarity index 100% rename from tests/functional/unhashable_dict_key.txt rename to tests/functional/u/unhashable_dict_key.txt diff --git a/tests/functional/unidiomatic_typecheck.py b/tests/functional/u/unidiomatic_typecheck.py similarity index 100% rename from tests/functional/unidiomatic_typecheck.py rename to tests/functional/u/unidiomatic_typecheck.py diff --git a/tests/functional/unidiomatic_typecheck.txt b/tests/functional/u/unidiomatic_typecheck.txt similarity index 100% rename from tests/functional/unidiomatic_typecheck.txt rename to tests/functional/u/unidiomatic_typecheck.txt diff --git a/tests/functional/uninferable_all_object.py b/tests/functional/u/uninferable_all_object.py similarity index 100% rename from tests/functional/uninferable_all_object.py rename to tests/functional/u/uninferable_all_object.py diff --git a/tests/functional/unknown_encoding_jython.py b/tests/functional/u/unknown_encoding_jython.py similarity index 100% rename from tests/functional/unknown_encoding_jython.py rename to tests/functional/u/unknown_encoding_jython.py diff --git a/tests/functional/unknown_encoding_jython.rc b/tests/functional/u/unknown_encoding_jython.rc similarity index 100% rename from tests/functional/unknown_encoding_jython.rc rename to tests/functional/u/unknown_encoding_jython.rc diff --git a/tests/functional/unknown_encoding_jython.txt b/tests/functional/u/unknown_encoding_jython.txt similarity index 100% rename from tests/functional/unknown_encoding_jython.txt rename to tests/functional/u/unknown_encoding_jython.txt diff --git a/tests/functional/unknown_encoding_py29.py b/tests/functional/u/unknown_encoding_py29.py similarity index 100% rename from tests/functional/unknown_encoding_py29.py rename to tests/functional/u/unknown_encoding_py29.py diff --git a/tests/functional/unknown_encoding_py29.rc b/tests/functional/u/unknown_encoding_py29.rc similarity index 100% rename from tests/functional/unknown_encoding_py29.rc rename to tests/functional/u/unknown_encoding_py29.rc diff --git a/tests/functional/unknown_encoding_py29.txt b/tests/functional/u/unknown_encoding_py29.txt similarity index 100% rename from tests/functional/unknown_encoding_py29.txt rename to tests/functional/u/unknown_encoding_py29.txt diff --git a/tests/functional/unnecessary_comprehension.py b/tests/functional/u/unnecessary_comprehension.py similarity index 100% rename from tests/functional/unnecessary_comprehension.py rename to tests/functional/u/unnecessary_comprehension.py diff --git a/tests/functional/unnecessary_comprehension.txt b/tests/functional/u/unnecessary_comprehension.txt similarity index 100% rename from tests/functional/unnecessary_comprehension.txt rename to tests/functional/u/unnecessary_comprehension.txt diff --git a/tests/functional/unnecessary_lambda.py b/tests/functional/u/unnecessary_lambda.py similarity index 100% rename from tests/functional/unnecessary_lambda.py rename to tests/functional/u/unnecessary_lambda.py diff --git a/tests/functional/unnecessary_lambda.txt b/tests/functional/u/unnecessary_lambda.txt similarity index 100% rename from tests/functional/unnecessary_lambda.txt rename to tests/functional/u/unnecessary_lambda.txt diff --git a/tests/functional/unnecessary_pass.py b/tests/functional/u/unnecessary_pass.py similarity index 100% rename from tests/functional/unnecessary_pass.py rename to tests/functional/u/unnecessary_pass.py diff --git a/tests/functional/unnecessary_pass.txt b/tests/functional/u/unnecessary_pass.txt similarity index 100% rename from tests/functional/unnecessary_pass.txt rename to tests/functional/u/unnecessary_pass.txt diff --git a/tests/functional/unneeded_not.py b/tests/functional/u/unneeded_not.py similarity index 100% rename from tests/functional/unneeded_not.py rename to tests/functional/u/unneeded_not.py diff --git a/tests/functional/unneeded_not.txt b/tests/functional/u/unneeded_not.txt similarity index 100% rename from tests/functional/unneeded_not.txt rename to tests/functional/u/unneeded_not.txt diff --git a/tests/functional/unpacked_exceptions.py b/tests/functional/u/unpacked_exceptions.py similarity index 100% rename from tests/functional/unpacked_exceptions.py rename to tests/functional/u/unpacked_exceptions.py diff --git a/tests/functional/unpacked_exceptions.rc b/tests/functional/u/unpacked_exceptions.rc similarity index 100% rename from tests/functional/unpacked_exceptions.rc rename to tests/functional/u/unpacked_exceptions.rc diff --git a/tests/functional/unpacked_exceptions.txt b/tests/functional/u/unpacked_exceptions.txt similarity index 100% rename from tests/functional/unpacked_exceptions.txt rename to tests/functional/u/unpacked_exceptions.txt diff --git a/tests/functional/unpacking.py b/tests/functional/u/unpacking.py similarity index 100% rename from tests/functional/unpacking.py rename to tests/functional/u/unpacking.py diff --git a/tests/functional/unpacking_generalizations.py b/tests/functional/u/unpacking_generalizations.py similarity index 100% rename from tests/functional/unpacking_generalizations.py rename to tests/functional/u/unpacking_generalizations.py diff --git a/tests/functional/unpacking_generalizations.rc b/tests/functional/u/unpacking_generalizations.rc similarity index 100% rename from tests/functional/unpacking_generalizations.rc rename to tests/functional/u/unpacking_generalizations.rc diff --git a/tests/functional/unpacking_generalizations.txt b/tests/functional/u/unpacking_generalizations.txt similarity index 100% rename from tests/functional/unpacking_generalizations.txt rename to tests/functional/u/unpacking_generalizations.txt diff --git a/tests/functional/unpacking_non_sequence.py b/tests/functional/u/unpacking_non_sequence.py similarity index 98% rename from tests/functional/unpacking_non_sequence.py rename to tests/functional/u/unpacking_non_sequence.py index 06a840b582..38eca384c2 100644 --- a/tests/functional/unpacking_non_sequence.py +++ b/tests/functional/u/unpacking_non_sequence.py @@ -4,7 +4,7 @@ # pylint: disable=using-constant-test, no-init, missing-docstring, wrong-import-order,wrong-import-position,no-else-return, useless-object-inheritance from os import rename as nonseq_func from six import with_metaclass -from functional.unpacking import nonseq +from functional.u.unpacking import nonseq __revision__ = 0 diff --git a/tests/functional/unpacking_non_sequence.txt b/tests/functional/u/unpacking_non_sequence.txt similarity index 89% rename from tests/functional/unpacking_non_sequence.txt rename to tests/functional/u/unpacking_non_sequence.txt index 0a21fab422..36f1421516 100644 --- a/tests/functional/unpacking_non_sequence.txt +++ b/tests/functional/u/unpacking_non_sequence.txt @@ -2,8 +2,8 @@ unpacking-non-sequence:78::Attempting to unpack a non-sequence defined at line 7 unpacking-non-sequence:79::Attempting to unpack a non-sequence unpacking-non-sequence:80::Attempting to unpack a non-sequence None unpacking-non-sequence:81::Attempting to unpack a non-sequence 1 -unpacking-non-sequence:82::Attempting to unpack a non-sequence defined at line 9 of functional.unpacking -unpacking-non-sequence:83::Attempting to unpack a non-sequence defined at line 11 of functional.unpacking +unpacking-non-sequence:82::Attempting to unpack a non-sequence defined at line 9 of functional.u.unpacking +unpacking-non-sequence:83::Attempting to unpack a non-sequence defined at line 11 of functional.u.unpacking unpacking-non-sequence:84::Attempting to unpack a non-sequence unpacking-non-sequence:99:ClassUnpacking.test:Attempting to unpack a non-sequence defined at line 75 unpacking-non-sequence:100:ClassUnpacking.test:Attempting to unpack a non-sequence diff --git a/tests/functional/unreachable.py b/tests/functional/u/unreachable.py similarity index 100% rename from tests/functional/unreachable.py rename to tests/functional/u/unreachable.py diff --git a/tests/functional/unreachable.txt b/tests/functional/u/unreachable.txt similarity index 100% rename from tests/functional/unreachable.txt rename to tests/functional/u/unreachable.txt diff --git a/tests/functional/unrecognized_inline_option.py b/tests/functional/u/unrecognized_inline_option.py similarity index 100% rename from tests/functional/unrecognized_inline_option.py rename to tests/functional/u/unrecognized_inline_option.py diff --git a/tests/functional/unrecognized_inline_option.txt b/tests/functional/u/unrecognized_inline_option.txt similarity index 100% rename from tests/functional/unrecognized_inline_option.txt rename to tests/functional/u/unrecognized_inline_option.txt diff --git a/tests/functional/unsubscriptable_value.py b/tests/functional/u/unsubscriptable_value.py similarity index 100% rename from tests/functional/unsubscriptable_value.py rename to tests/functional/u/unsubscriptable_value.py diff --git a/tests/functional/unsubscriptable_value.txt b/tests/functional/u/unsubscriptable_value.txt similarity index 100% rename from tests/functional/unsubscriptable_value.txt rename to tests/functional/u/unsubscriptable_value.txt diff --git a/tests/functional/unsubscriptable_value_py37.py b/tests/functional/u/unsubscriptable_value_py37.py similarity index 100% rename from tests/functional/unsubscriptable_value_py37.py rename to tests/functional/u/unsubscriptable_value_py37.py diff --git a/tests/functional/unsubscriptable_value_py37.rc b/tests/functional/u/unsubscriptable_value_py37.rc similarity index 100% rename from tests/functional/unsubscriptable_value_py37.rc rename to tests/functional/u/unsubscriptable_value_py37.rc diff --git a/tests/functional/unsubscriptable_value_py37.txt b/tests/functional/u/unsubscriptable_value_py37.txt similarity index 100% rename from tests/functional/unsubscriptable_value_py37.txt rename to tests/functional/u/unsubscriptable_value_py37.txt diff --git a/tests/functional/unsupported_assignment_operation.py b/tests/functional/u/unsupported_assignment_operation.py similarity index 100% rename from tests/functional/unsupported_assignment_operation.py rename to tests/functional/u/unsupported_assignment_operation.py diff --git a/tests/functional/unsupported_assignment_operation.txt b/tests/functional/u/unsupported_assignment_operation.txt similarity index 100% rename from tests/functional/unsupported_assignment_operation.txt rename to tests/functional/u/unsupported_assignment_operation.txt diff --git a/tests/functional/unsupported_binary_operation.py b/tests/functional/u/unsupported_binary_operation.py similarity index 100% rename from tests/functional/unsupported_binary_operation.py rename to tests/functional/u/unsupported_binary_operation.py diff --git a/tests/functional/unsupported_binary_operation.rc b/tests/functional/u/unsupported_binary_operation.rc similarity index 100% rename from tests/functional/unsupported_binary_operation.rc rename to tests/functional/u/unsupported_binary_operation.rc diff --git a/tests/functional/unsupported_binary_operation.txt b/tests/functional/u/unsupported_binary_operation.txt similarity index 100% rename from tests/functional/unsupported_binary_operation.txt rename to tests/functional/u/unsupported_binary_operation.txt diff --git a/tests/functional/unsupported_delete_operation.py b/tests/functional/u/unsupported_delete_operation.py similarity index 100% rename from tests/functional/unsupported_delete_operation.py rename to tests/functional/u/unsupported_delete_operation.py diff --git a/tests/functional/unsupported_delete_operation.txt b/tests/functional/u/unsupported_delete_operation.txt similarity index 100% rename from tests/functional/unsupported_delete_operation.txt rename to tests/functional/u/unsupported_delete_operation.txt diff --git a/tests/functional/unused_argument.py b/tests/functional/u/unused_argument.py similarity index 100% rename from tests/functional/unused_argument.py rename to tests/functional/u/unused_argument.py diff --git a/tests/functional/unused_argument.txt b/tests/functional/u/unused_argument.txt similarity index 100% rename from tests/functional/unused_argument.txt rename to tests/functional/u/unused_argument.txt diff --git a/tests/functional/unused_argument_py3.py b/tests/functional/u/unused_argument_py3.py similarity index 100% rename from tests/functional/unused_argument_py3.py rename to tests/functional/u/unused_argument_py3.py diff --git a/tests/functional/unused_argument_py3.rc b/tests/functional/u/unused_argument_py3.rc similarity index 100% rename from tests/functional/unused_argument_py3.rc rename to tests/functional/u/unused_argument_py3.rc diff --git a/tests/functional/unused_argument_py3.txt b/tests/functional/u/unused_argument_py3.txt similarity index 100% rename from tests/functional/unused_argument_py3.txt rename to tests/functional/u/unused_argument_py3.txt diff --git a/tests/functional/unused_global_variable1.py b/tests/functional/u/unused_global_variable1.py similarity index 100% rename from tests/functional/unused_global_variable1.py rename to tests/functional/u/unused_global_variable1.py diff --git a/tests/functional/unused_global_variable2.py b/tests/functional/u/unused_global_variable2.py similarity index 100% rename from tests/functional/unused_global_variable2.py rename to tests/functional/u/unused_global_variable2.py diff --git a/tests/functional/unused_global_variable2.rc b/tests/functional/u/unused_global_variable2.rc similarity index 100% rename from tests/functional/unused_global_variable2.rc rename to tests/functional/u/unused_global_variable2.rc diff --git a/tests/functional/unused_global_variable2.txt b/tests/functional/u/unused_global_variable2.txt similarity index 100% rename from tests/functional/unused_global_variable2.txt rename to tests/functional/u/unused_global_variable2.txt diff --git a/tests/functional/unused_global_variable3.py b/tests/functional/u/unused_global_variable3.py similarity index 100% rename from tests/functional/unused_global_variable3.py rename to tests/functional/u/unused_global_variable3.py diff --git a/tests/functional/unused_global_variable4.py b/tests/functional/u/unused_global_variable4.py similarity index 100% rename from tests/functional/unused_global_variable4.py rename to tests/functional/u/unused_global_variable4.py diff --git a/tests/functional/unused_global_variable4.rc b/tests/functional/u/unused_global_variable4.rc similarity index 100% rename from tests/functional/unused_global_variable4.rc rename to tests/functional/u/unused_global_variable4.rc diff --git a/tests/functional/unused_global_variable4.txt b/tests/functional/u/unused_global_variable4.txt similarity index 100% rename from tests/functional/unused_global_variable4.txt rename to tests/functional/u/unused_global_variable4.txt diff --git a/tests/functional/unused_import.py b/tests/functional/u/unused_import.py similarity index 100% rename from tests/functional/unused_import.py rename to tests/functional/u/unused_import.py diff --git a/tests/functional/unused_import.txt b/tests/functional/u/unused_import.txt similarity index 100% rename from tests/functional/unused_import.txt rename to tests/functional/u/unused_import.txt diff --git a/tests/functional/unused_import_assigned_to.py b/tests/functional/u/unused_import_assigned_to.py similarity index 100% rename from tests/functional/unused_import_assigned_to.py rename to tests/functional/u/unused_import_assigned_to.py diff --git a/tests/functional/unused_typing_imports.py b/tests/functional/u/unused_typing_imports.py similarity index 100% rename from tests/functional/unused_typing_imports.py rename to tests/functional/u/unused_typing_imports.py diff --git a/tests/functional/unused_typing_imports.rc b/tests/functional/u/unused_typing_imports.rc similarity index 100% rename from tests/functional/unused_typing_imports.rc rename to tests/functional/u/unused_typing_imports.rc diff --git a/tests/functional/unused_variable.py b/tests/functional/u/unused_variable.py similarity index 100% rename from tests/functional/unused_variable.py rename to tests/functional/u/unused_variable.py diff --git a/tests/functional/unused_variable.txt b/tests/functional/u/unused_variable.txt similarity index 100% rename from tests/functional/unused_variable.txt rename to tests/functional/u/unused_variable.txt diff --git a/tests/functional/unused_variable_py36.py b/tests/functional/u/unused_variable_py36.py similarity index 100% rename from tests/functional/unused_variable_py36.py rename to tests/functional/u/unused_variable_py36.py diff --git a/tests/functional/unused_variable_py36.rc b/tests/functional/u/unused_variable_py36.rc similarity index 100% rename from tests/functional/unused_variable_py36.rc rename to tests/functional/u/unused_variable_py36.rc diff --git a/tests/functional/u/unused_variable_py36.txt b/tests/functional/u/unused_variable_py36.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/used_before_assignment_488.py b/tests/functional/u/used_before_assignment_488.py similarity index 100% rename from tests/functional/used_before_assignment_488.py rename to tests/functional/u/used_before_assignment_488.py diff --git a/tests/functional/used_before_assignment_issue1081.py b/tests/functional/u/used_before_assignment_issue1081.py similarity index 100% rename from tests/functional/used_before_assignment_issue1081.py rename to tests/functional/u/used_before_assignment_issue1081.py diff --git a/tests/functional/used_before_assignment_issue1081.txt b/tests/functional/u/used_before_assignment_issue1081.txt similarity index 100% rename from tests/functional/used_before_assignment_issue1081.txt rename to tests/functional/u/used_before_assignment_issue1081.txt diff --git a/tests/functional/used_before_assignment_issue853.py b/tests/functional/u/used_before_assignment_issue853.py similarity index 100% rename from tests/functional/used_before_assignment_issue853.py rename to tests/functional/u/used_before_assignment_issue853.py diff --git a/tests/functional/used_before_assignment_nonlocal.py b/tests/functional/u/used_before_assignment_nonlocal.py similarity index 100% rename from tests/functional/used_before_assignment_nonlocal.py rename to tests/functional/u/used_before_assignment_nonlocal.py diff --git a/tests/functional/used_before_assignment_nonlocal.rc b/tests/functional/u/used_before_assignment_nonlocal.rc similarity index 100% rename from tests/functional/used_before_assignment_nonlocal.rc rename to tests/functional/u/used_before_assignment_nonlocal.rc diff --git a/tests/functional/used_before_assignment_nonlocal.txt b/tests/functional/u/used_before_assignment_nonlocal.txt similarity index 100% rename from tests/functional/used_before_assignment_nonlocal.txt rename to tests/functional/u/used_before_assignment_nonlocal.txt diff --git a/tests/functional/used_prior_global_declaration.py b/tests/functional/u/used_prior_global_declaration.py similarity index 100% rename from tests/functional/used_prior_global_declaration.py rename to tests/functional/u/used_prior_global_declaration.py diff --git a/tests/functional/used_prior_global_declaration.rc b/tests/functional/u/used_prior_global_declaration.rc similarity index 100% rename from tests/functional/used_prior_global_declaration.rc rename to tests/functional/u/used_prior_global_declaration.rc diff --git a/tests/functional/used_prior_global_declaration.txt b/tests/functional/u/used_prior_global_declaration.txt similarity index 100% rename from tests/functional/used_prior_global_declaration.txt rename to tests/functional/u/used_prior_global_declaration.txt diff --git a/tests/functional/useless-import-alias.py b/tests/functional/u/useless-import-alias.py similarity index 100% rename from tests/functional/useless-import-alias.py rename to tests/functional/u/useless-import-alias.py diff --git a/tests/functional/useless-import-alias.txt b/tests/functional/u/useless-import-alias.txt similarity index 100% rename from tests/functional/useless-import-alias.txt rename to tests/functional/u/useless-import-alias.txt diff --git a/tests/functional/useless_else_on_loop.py b/tests/functional/u/useless_else_on_loop.py similarity index 100% rename from tests/functional/useless_else_on_loop.py rename to tests/functional/u/useless_else_on_loop.py diff --git a/tests/functional/useless_else_on_loop.txt b/tests/functional/u/useless_else_on_loop.txt similarity index 100% rename from tests/functional/useless_else_on_loop.txt rename to tests/functional/u/useless_else_on_loop.txt diff --git a/tests/functional/useless_object_inheritance.py b/tests/functional/u/useless_object_inheritance.py similarity index 100% rename from tests/functional/useless_object_inheritance.py rename to tests/functional/u/useless_object_inheritance.py diff --git a/tests/functional/useless_object_inheritance.txt b/tests/functional/u/useless_object_inheritance.txt similarity index 100% rename from tests/functional/useless_object_inheritance.txt rename to tests/functional/u/useless_object_inheritance.txt diff --git a/tests/functional/useless_return.py b/tests/functional/u/useless_return.py similarity index 100% rename from tests/functional/useless_return.py rename to tests/functional/u/useless_return.py diff --git a/tests/functional/useless_return.txt b/tests/functional/u/useless_return.txt similarity index 100% rename from tests/functional/useless_return.txt rename to tests/functional/u/useless_return.txt diff --git a/tests/functional/useless_super_delegation.py b/tests/functional/u/useless_super_delegation.py similarity index 100% rename from tests/functional/useless_super_delegation.py rename to tests/functional/u/useless_super_delegation.py diff --git a/tests/functional/useless_super_delegation.txt b/tests/functional/u/useless_super_delegation.txt similarity index 100% rename from tests/functional/useless_super_delegation.txt rename to tests/functional/u/useless_super_delegation.txt diff --git a/tests/functional/useless_super_delegation_py3.py b/tests/functional/u/useless_super_delegation_py3.py similarity index 100% rename from tests/functional/useless_super_delegation_py3.py rename to tests/functional/u/useless_super_delegation_py3.py diff --git a/tests/functional/useless_super_delegation_py3.rc b/tests/functional/u/useless_super_delegation_py3.rc similarity index 100% rename from tests/functional/useless_super_delegation_py3.rc rename to tests/functional/u/useless_super_delegation_py3.rc diff --git a/tests/functional/useless_super_delegation_py3.txt b/tests/functional/u/useless_super_delegation_py3.txt similarity index 100% rename from tests/functional/useless_super_delegation_py3.txt rename to tests/functional/u/useless_super_delegation_py3.txt diff --git a/tests/functional/useless_super_delegation_py35.py b/tests/functional/u/useless_super_delegation_py35.py similarity index 100% rename from tests/functional/useless_super_delegation_py35.py rename to tests/functional/u/useless_super_delegation_py35.py diff --git a/tests/functional/useless_super_delegation_py35.rc b/tests/functional/u/useless_super_delegation_py35.rc similarity index 100% rename from tests/functional/useless_super_delegation_py35.rc rename to tests/functional/u/useless_super_delegation_py35.rc diff --git a/tests/functional/useless_super_delegation_py35.txt b/tests/functional/u/useless_super_delegation_py35.txt similarity index 100% rename from tests/functional/useless_super_delegation_py35.txt rename to tests/functional/u/useless_super_delegation_py35.txt diff --git a/tests/functional/using_constant_test.py b/tests/functional/u/using_constant_test.py similarity index 100% rename from tests/functional/using_constant_test.py rename to tests/functional/u/using_constant_test.py diff --git a/tests/functional/using_constant_test.txt b/tests/functional/u/using_constant_test.txt similarity index 100% rename from tests/functional/using_constant_test.txt rename to tests/functional/u/using_constant_test.txt diff --git a/tests/functional/w/__init__.py b/tests/functional/w/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/wildcard_import.py b/tests/functional/w/wildcard_import.py similarity index 100% rename from tests/functional/wildcard_import.py rename to tests/functional/w/wildcard_import.py diff --git a/tests/functional/wildcard_import.txt b/tests/functional/w/wildcard_import.txt similarity index 100% rename from tests/functional/wildcard_import.txt rename to tests/functional/w/wildcard_import.txt diff --git a/tests/functional/wildcard_import_allowed.py b/tests/functional/w/wildcard_import_allowed.py similarity index 100% rename from tests/functional/wildcard_import_allowed.py rename to tests/functional/w/wildcard_import_allowed.py diff --git a/tests/functional/wildcard_import_allowed.rc b/tests/functional/w/wildcard_import_allowed.rc similarity index 100% rename from tests/functional/wildcard_import_allowed.rc rename to tests/functional/w/wildcard_import_allowed.rc diff --git a/tests/functional/wildcard_import_allowed.txt b/tests/functional/w/wildcard_import_allowed.txt similarity index 100% rename from tests/functional/wildcard_import_allowed.txt rename to tests/functional/w/wildcard_import_allowed.txt diff --git a/tests/functional/with_used_before_assign.py b/tests/functional/w/with_used_before_assign.py similarity index 100% rename from tests/functional/with_used_before_assign.py rename to tests/functional/w/with_used_before_assign.py diff --git a/tests/functional/with_used_before_assign.txt b/tests/functional/w/with_used_before_assign.txt similarity index 100% rename from tests/functional/with_used_before_assign.txt rename to tests/functional/w/with_used_before_assign.txt diff --git a/tests/functional/with_using_generator.py b/tests/functional/w/with_using_generator.py similarity index 100% rename from tests/functional/with_using_generator.py rename to tests/functional/w/with_using_generator.py diff --git a/tests/functional/with_using_generator.txt b/tests/functional/w/with_using_generator.txt similarity index 100% rename from tests/functional/with_using_generator.txt rename to tests/functional/w/with_using_generator.txt diff --git a/tests/functional/wrong_exception_operation.py b/tests/functional/w/wrong_exception_operation.py similarity index 100% rename from tests/functional/wrong_exception_operation.py rename to tests/functional/w/wrong_exception_operation.py diff --git a/tests/functional/wrong_exception_operation.txt b/tests/functional/w/wrong_exception_operation.txt similarity index 100% rename from tests/functional/wrong_exception_operation.txt rename to tests/functional/w/wrong_exception_operation.txt diff --git a/tests/functional/wrong_import_order.py b/tests/functional/w/wrong_import_order.py similarity index 100% rename from tests/functional/wrong_import_order.py rename to tests/functional/w/wrong_import_order.py diff --git a/tests/functional/wrong_import_order.txt b/tests/functional/w/wrong_import_order.txt similarity index 100% rename from tests/functional/wrong_import_order.txt rename to tests/functional/w/wrong_import_order.txt diff --git a/tests/functional/wrong_import_order2.py b/tests/functional/w/wrong_import_order2.py similarity index 100% rename from tests/functional/wrong_import_order2.py rename to tests/functional/w/wrong_import_order2.py diff --git a/tests/functional/wrong_import_position.py b/tests/functional/w/wrong_import_position.py similarity index 100% rename from tests/functional/wrong_import_position.py rename to tests/functional/w/wrong_import_position.py diff --git a/tests/functional/wrong_import_position.txt b/tests/functional/w/wrong_import_position.txt similarity index 100% rename from tests/functional/wrong_import_position.txt rename to tests/functional/w/wrong_import_position.txt diff --git a/tests/functional/wrong_import_position10.py b/tests/functional/w/wrong_import_position10.py similarity index 100% rename from tests/functional/wrong_import_position10.py rename to tests/functional/w/wrong_import_position10.py diff --git a/tests/functional/wrong_import_position11.py b/tests/functional/w/wrong_import_position11.py similarity index 100% rename from tests/functional/wrong_import_position11.py rename to tests/functional/w/wrong_import_position11.py diff --git a/tests/functional/wrong_import_position11.txt b/tests/functional/w/wrong_import_position11.txt similarity index 100% rename from tests/functional/wrong_import_position11.txt rename to tests/functional/w/wrong_import_position11.txt diff --git a/tests/functional/wrong_import_position12.py b/tests/functional/w/wrong_import_position12.py similarity index 100% rename from tests/functional/wrong_import_position12.py rename to tests/functional/w/wrong_import_position12.py diff --git a/tests/functional/wrong_import_position12.txt b/tests/functional/w/wrong_import_position12.txt similarity index 100% rename from tests/functional/wrong_import_position12.txt rename to tests/functional/w/wrong_import_position12.txt diff --git a/tests/functional/wrong_import_position13.py b/tests/functional/w/wrong_import_position13.py similarity index 100% rename from tests/functional/wrong_import_position13.py rename to tests/functional/w/wrong_import_position13.py diff --git a/tests/functional/wrong_import_position13.txt b/tests/functional/w/wrong_import_position13.txt similarity index 100% rename from tests/functional/wrong_import_position13.txt rename to tests/functional/w/wrong_import_position13.txt diff --git a/tests/functional/wrong_import_position14.py b/tests/functional/w/wrong_import_position14.py similarity index 100% rename from tests/functional/wrong_import_position14.py rename to tests/functional/w/wrong_import_position14.py diff --git a/tests/functional/wrong_import_position14.txt b/tests/functional/w/wrong_import_position14.txt similarity index 100% rename from tests/functional/wrong_import_position14.txt rename to tests/functional/w/wrong_import_position14.txt diff --git a/tests/functional/wrong_import_position15.py b/tests/functional/w/wrong_import_position15.py similarity index 100% rename from tests/functional/wrong_import_position15.py rename to tests/functional/w/wrong_import_position15.py diff --git a/tests/functional/wrong_import_position2.py b/tests/functional/w/wrong_import_position2.py similarity index 100% rename from tests/functional/wrong_import_position2.py rename to tests/functional/w/wrong_import_position2.py diff --git a/tests/functional/wrong_import_position3.py b/tests/functional/w/wrong_import_position3.py similarity index 100% rename from tests/functional/wrong_import_position3.py rename to tests/functional/w/wrong_import_position3.py diff --git a/tests/functional/wrong_import_position4.py b/tests/functional/w/wrong_import_position4.py similarity index 100% rename from tests/functional/wrong_import_position4.py rename to tests/functional/w/wrong_import_position4.py diff --git a/tests/functional/wrong_import_position5.py b/tests/functional/w/wrong_import_position5.py similarity index 100% rename from tests/functional/wrong_import_position5.py rename to tests/functional/w/wrong_import_position5.py diff --git a/tests/functional/wrong_import_position6.py b/tests/functional/w/wrong_import_position6.py similarity index 100% rename from tests/functional/wrong_import_position6.py rename to tests/functional/w/wrong_import_position6.py diff --git a/tests/functional/wrong_import_position7.py b/tests/functional/w/wrong_import_position7.py similarity index 100% rename from tests/functional/wrong_import_position7.py rename to tests/functional/w/wrong_import_position7.py diff --git a/tests/functional/wrong_import_position8.py b/tests/functional/w/wrong_import_position8.py similarity index 100% rename from tests/functional/wrong_import_position8.py rename to tests/functional/w/wrong_import_position8.py diff --git a/tests/functional/wrong_import_position9.py b/tests/functional/w/wrong_import_position9.py similarity index 100% rename from tests/functional/wrong_import_position9.py rename to tests/functional/w/wrong_import_position9.py diff --git a/tests/functional/wrong_import_position_exclude_dunder_main.py b/tests/functional/w/wrong_import_position_exclude_dunder_main.py similarity index 100% rename from tests/functional/wrong_import_position_exclude_dunder_main.py rename to tests/functional/w/wrong_import_position_exclude_dunder_main.py diff --git a/tests/functional/w/wrong_import_position_exclude_dunder_main.txt b/tests/functional/w/wrong_import_position_exclude_dunder_main.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/y/__init__.py b/tests/functional/y/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functional/yield_from_iterable_py33.py b/tests/functional/y/yield_from_iterable_py33.py similarity index 100% rename from tests/functional/yield_from_iterable_py33.py rename to tests/functional/y/yield_from_iterable_py33.py diff --git a/tests/functional/yield_from_iterable_py33.rc b/tests/functional/y/yield_from_iterable_py33.rc similarity index 100% rename from tests/functional/yield_from_iterable_py33.rc rename to tests/functional/y/yield_from_iterable_py33.rc diff --git a/tests/functional/yield_from_iterable_py33.txt b/tests/functional/y/yield_from_iterable_py33.txt similarity index 100% rename from tests/functional/yield_from_iterable_py33.txt rename to tests/functional/y/yield_from_iterable_py33.txt diff --git a/tests/functional/yield_from_outside_func.py b/tests/functional/y/yield_from_outside_func.py similarity index 100% rename from tests/functional/yield_from_outside_func.py rename to tests/functional/y/yield_from_outside_func.py diff --git a/tests/functional/yield_from_outside_func.rc b/tests/functional/y/yield_from_outside_func.rc similarity index 100% rename from tests/functional/yield_from_outside_func.rc rename to tests/functional/y/yield_from_outside_func.rc diff --git a/tests/functional/yield_from_outside_func.txt b/tests/functional/y/yield_from_outside_func.txt similarity index 100% rename from tests/functional/yield_from_outside_func.txt rename to tests/functional/y/yield_from_outside_func.txt diff --git a/tests/functional/yield_inside_async_function.py b/tests/functional/y/yield_inside_async_function.py similarity index 100% rename from tests/functional/yield_inside_async_function.py rename to tests/functional/y/yield_inside_async_function.py diff --git a/tests/functional/yield_inside_async_function.rc b/tests/functional/y/yield_inside_async_function.rc similarity index 100% rename from tests/functional/yield_inside_async_function.rc rename to tests/functional/y/yield_inside_async_function.rc diff --git a/tests/functional/yield_inside_async_function.txt b/tests/functional/y/yield_inside_async_function.txt similarity index 100% rename from tests/functional/yield_inside_async_function.txt rename to tests/functional/y/yield_inside_async_function.txt diff --git a/tests/functional/yield_inside_async_function_py36.py b/tests/functional/y/yield_inside_async_function_py36.py similarity index 100% rename from tests/functional/yield_inside_async_function_py36.py rename to tests/functional/y/yield_inside_async_function_py36.py diff --git a/tests/functional/yield_inside_async_function_py36.rc b/tests/functional/y/yield_inside_async_function_py36.rc similarity index 100% rename from tests/functional/yield_inside_async_function_py36.rc rename to tests/functional/y/yield_inside_async_function_py36.rc diff --git a/tests/functional/yield_inside_async_function_py36.txt b/tests/functional/y/yield_inside_async_function_py36.txt similarity index 100% rename from tests/functional/yield_inside_async_function_py36.txt rename to tests/functional/y/yield_inside_async_function_py36.txt diff --git a/tests/functional/yield_outside_func.py b/tests/functional/y/yield_outside_func.py similarity index 100% rename from tests/functional/yield_outside_func.py rename to tests/functional/y/yield_outside_func.py diff --git a/tests/functional/yield_outside_func.txt b/tests/functional/y/yield_outside_func.txt similarity index 100% rename from tests/functional/yield_outside_func.txt rename to tests/functional/y/yield_outside_func.txt diff --git a/tests/test_functional.py b/tests/test_functional.py index 9ff9e77632..50a46c0141 100644 --- a/tests/test_functional.py +++ b/tests/test_functional.py @@ -134,6 +134,9 @@ def __init__(self, directory, filename): } self._parse_options() + def __repr__(self): + return "FunctionalTest:{}".format(self.base) + def _parse_options(self): cp = configparser.ConfigParser() cp.add_section("testoptions") @@ -167,8 +170,7 @@ def _file_type(self, ext, check_exists=True): name = os.path.join(self._directory, self.base + ext) if not check_exists or os.path.exists(name): return name - else: - raise NoFileError + raise NoFileError("Cannot find '{}'.".format(name)) _OPERATORS = {">": operator.gt, "<": operator.lt, ">=": operator.ge, "<=": operator.le} @@ -311,13 +313,16 @@ def _get_received(self): received_msgs = collections.Counter() received_output_lines = [] for msg in messages: + assert ( + msg.symbol != "fatal" + ), "Pylint analysis failed because of '{}'".format(msg.msg) received_msgs[msg.line, msg.symbol] += 1 received_output_lines.append(OutputLine.from_msg(msg)) return received_msgs, received_output_lines def _runTest(self): - self._linter.check([self._test_file.module]) - + modules_to_check = [self._test_file.source] + self._linter.check(modules_to_check) expected_messages, expected_text = self._get_expected() received_messages, received_text = self._get_received() @@ -373,9 +378,12 @@ def _check_output_text(self, expected_messages, expected_lines, received_lines): def get_tests(): input_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "functional") suite = [] - for fname in os.listdir(input_dir): - if fname != "__init__.py" and fname.endswith(".py"): - suite.append(FunctionalTestFile(input_dir, fname)) + for dirpath, dirnames, filenames in os.walk(input_dir): + if dirpath.endswith("__pycache__"): + continue + for filename in filenames: + if filename != "__init__.py" and filename.endswith(".py"): + suite.append(FunctionalTestFile(dirpath, filename)) return suite diff --git a/tests/test_self.py b/tests/test_self.py index bcde2e5b15..3f029e131d 100644 --- a/tests/test_self.py +++ b/tests/test_self.py @@ -146,7 +146,7 @@ def test_all(self): JSONReporter(StringIO()), ] self._runtest( - [join(HERE, "functional/arguments.py")], + [join(HERE, "functional", "a", "arguments.py")], reporter=MultiReporter(reporters), code=2, ) @@ -226,7 +226,7 @@ def test_no_out_encoding(self): strio = StringIO() assert strio.encoding is None self._runtest( - [join(HERE, "regrtest_data/no_stdout_encoding.py"), "--enable=all"], + [join(HERE, "regrtest_data", "no_stdout_encoding.py"), "--enable=all"], out=strio, code=28, ) @@ -235,8 +235,8 @@ def test_parallel_execution(self): self._runtest( [ "-j 2", - join(HERE, "functional/arguments.py"), - join(HERE, "functional/arguments.py"), + join(HERE, "functional", "a", "arguments.py"), + join(HERE, "functional", "a", "arguments.py"), ], code=2, ) @@ -248,13 +248,14 @@ def test_py3k_option(self): # Test that --py3k flag works. rc_code = 0 self._runtest( - [join(HERE, "functional", "unpacked_exceptions.py"), "--py3k"], code=rc_code + [join(HERE, "functional", "u", "unpacked_exceptions.py"), "--py3k"], + code=rc_code, ) def test_py3k_jobs_option(self): rc_code = 0 self._runtest( - [join(HERE, "functional", "unpacked_exceptions.py"), "--py3k", "-j 2"], + [join(HERE, "functional", "u", "unpacked_exceptions.py"), "--py3k", "-j 2"], code=rc_code, )