From 626a14835aceed6833bd8036e733e5e6a819dda1 Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Thu, 19 Sep 2019 11:57:49 +0300 Subject: [PATCH] IDEA-CR-53093: PY-37226 Revert pydev prefix for test directories GitOrigin-RevId: 3d4abb05167e85cb44720e36d0fa3b949f199f30 --- .../pycharm/PyCharmPropertiesBase.groovy | 2 +- .../pydev/_pydevd_bundle/pydevd_constants.py | 2 +- .../pydevd_trace_dispatch_regular.py | 2 +- .../pydev/build_tools/generate_code.py | 10 +++--- .../__init__.py | 0 .../test_pydevd_reload.py | 0 .../pydev/{tests => pydev_tests}/__init__.py | 0 .../test_check_pydevconsole.py | 0 .../test_get_referrers.py | 0 .../{tests => pydev_tests}/test_jyserver.py | 0 .../test_jysimpleTipper.py | 0 .../test_pydev_ipython_011.py | 0 .../test_pydevconsole.py | 0 .../{tests => pydev_tests}/test_pyserver.py | 0 .../{tests => pydev_tests}/test_signature.py | 0 .../test_simpleTipper.py | 0 .../README | 0 .../__init__.py | 0 .../gui-glut.py | 0 .../gui-gtk.py | 0 .../gui-gtk3.py | 0 .../gui-pyglet.py | 0 .../gui-qt.py | 0 .../gui-tk.py | 0 .../gui-wx.py | 0 .../__init__.py | 0 .../_debugger_case20.py | 0 .../_debugger_case_breakpoint.py | 0 .../_debugger_case_breakpoint2.py | 0 .../debug_constants.py | 0 .../debugger_fixtures.py | 8 ++--- .../debugger_unittest.py | 2 +- .../flask1/__init__.py | 0 .../flask1/app.py | 0 .../flask1/templates/hello.html | 0 .../my_django_proj_17/manage.py | 0 .../my_django_proj_17/my_app/__init__.py | 0 .../my_django_proj_17/my_app/admin.py | 0 .../my_django_proj_17/my_app/forms.py | 0 .../my_django_proj_17/my_app/models.py | 0 .../my_app/templates/my_app/index.html | 0 .../my_app/templates/my_app/name.html | 0 .../my_django_proj_17/my_app/tests.py | 0 .../my_django_proj_17/my_app/urls.py | 0 .../my_django_proj_17/my_app/views.py | 0 .../my_django_proj_17/__init__.py | 0 .../my_django_proj_17/settings.py | 0 .../my_django_proj_17/urls.py | 0 .../my_django_proj_17/wsgi.py | 0 .../my_django_proj_21/manage.py | 0 .../my_django_proj_21/my_app/__init__.py | 0 .../my_django_proj_21/my_app/admin.py | 0 .../my_django_proj_21/my_app/apps.py | 0 .../my_django_proj_21/my_app/forms.py | 0 .../my_app/migrations/__init__.py | 0 .../my_django_proj_21/my_app/models.py | 0 .../my_app/templates/my_app/index.html | 0 .../my_app/templates/my_app/name.html | 0 .../my_django_proj_21/my_app/urls.py | 0 .../my_django_proj_21/my_app/views.py | 0 .../my_django_proj_21/__init__.py | 0 .../my_django_proj_21/settings.py | 0 .../my_django_proj_21/urls.py | 0 .../my_django_proj_21/wsgi.py | 0 .../my_extensions/pydevd_plugins/__init__.py | 0 .../pydevd_plugins/extensions/__init__.py | 0 .../extensions/pydevd_plugin_test_events.py | 0 .../extensions/pydevd_plugin_test_exttype.py | 0 .../performance_check.py | 4 +-- .../regression_check.py | 0 .../resources/__init__.py | 0 .../resources/_bytecode_many_names_example.py | 0 .../resources/_bytecode_overflow_example.py | 0 .../resources/_debugger_case1.py | 0 .../resources/_debugger_case13.py | 0 .../resources/_debugger_case14.py | 0 .../resources/_debugger_case15.py | 0 .../resources/_debugger_case15_execfile.py | 0 .../resources/_debugger_case16.py | 0 .../resources/_debugger_case17.py | 0 .../resources/_debugger_case17a.py | 0 .../resources/_debugger_case18.py | 0 .../resources/_debugger_case19.py | 0 .../resources/_debugger_case2.py | 0 .../resources/_debugger_case20.py | 0 .../resources/_debugger_case3.py | 0 .../resources/_debugger_case4.py | 0 .../resources/_debugger_case56.py | 0 .../resources/_debugger_case7.py | 0 .../resources/_debugger_case89.py | 0 .../resources/_debugger_case_breakpoint.py | 0 .../resources/_debugger_case_breakpoint2.py | 0 ..._debugger_case_breakpoint_condition_exc.py | 0 .../_debugger_case_breakpoint_remote.py | 0 ...bugger_case_breakpoint_remote_no_import.py | 0 .../resources/_debugger_case_change_breaks.py | 0 .../resources/_debugger_case_check_tracer.py | 0 .../resources/_debugger_case_event_ext.py | 0 .../resources/_debugger_case_exceptions.py | 0 .../resources/_debugger_case_frame_eval.py | 0 .../resources/_debugger_case_generator_py2.py | 0 .../resources/_debugger_case_generator_py3.py | 0 ...ebugger_case_get_next_statement_targets.py | 0 .../_debugger_case_get_thread_stack.py | 0 .../_debugger_case_import_imported.py | 0 .../resources/_debugger_case_import_main.py | 0 .../resources/_debugger_case_lamda.py | 0 .../resources/_debugger_case_m_switch.py | 0 .../resources/_debugger_case_m_switch_2.py | 0 .../_debugger_case_module_entry_point.py | 0 .../_debugger_case_multiple_threads.py | 0 .../_debugger_case_multiprocessing.py | 0 .../_debugger_case_path_translation.py | 0 .../resources/_debugger_case_print.py | 0 .../resources/_debugger_case_qthread1.py | 0 .../resources/_debugger_case_qthread2.py | 0 .../resources/_debugger_case_qthread3.py | 0 .../resources/_debugger_case_qthread4.py | 0 .../resources/_debugger_case_redirect.py | 0 .../resources/_debugger_case_remote.py | 0 .../resources/_debugger_case_remote_1.py | 0 .../resources/_debugger_case_remote_2.py | 0 ...bugger_case_remote_unhandled_exceptions.py | 0 ...ugger_case_remote_unhandled_exceptions2.py | 0 .../resources/_debugger_case_return_value.py | 0 .../resources/_debugger_case_scapy.py | 0 .../_debugger_case_set_next_statement.py | 0 .../resources/_debugger_case_settrace.py | 0 .../resources/_debugger_case_simple_calls.py | 0 ...gger_case_skip_breakpoint_in_exceptions.py | 0 .../resources/_debugger_case_suspend_all.py | 0 .../_debugger_case_suspend_policy.py | 0 ..._debugger_case_thread_creation_deadlock.py | 0 .../_debugger_case_trace_dispatch.py | 0 .../resources/_debugger_case_type_ext.py | 0 ...gger_case_unhandled_exception_get_stack.py | 0 .../_debugger_case_unhandled_exceptions.py | 0 ..._case_unhandled_exceptions_on_top_level.py | 0 ...case_unhandled_exceptions_on_top_level2.py | 0 .../resources/_debugger_case_zip_files.py | 0 .../resources/_performance_1.py | 0 .../resources/_performance_2.py | 0 .../resources/_performance_3.py | 0 .../_pydev_coverage_cyrillic_encoding_py2.py | 0 .../_pydev_coverage_cyrillic_encoding_py3.py | 0 .../resources/_pydev_coverage_syntax_error.py | 0 .../resources/launch/foo/__main__.py | 0 .../resources/launch/foo/bar.py | 0 .../test_additional_thread_info.py | 0 .../test_bytecode_modification.py | 4 +-- .../test_collect_try_except_info.py | 2 +- .../test_collect_try_except_info.json | 0 .../test_iter_bytecode.py26.json | 0 .../test_iter_bytecode.py27.json | 0 .../test_iter_bytecode.py36.json | 0 .../test_iter_bytecode.py37.json | 0 .../test_convert_utilities.py | 0 .../test_debugger.py | 34 +++++++++---------- .../test_dump_threads.py | 0 .../test_frame_eval_and_tracing.py | 8 ++--- .../test_frame_evaluator.py | 4 +-- .../test_in_project_roots.py | 0 .../test_null.py | 0 .../test_process_command_line.py | 0 .../test_pydev_monkey.py | 0 .../test_pydevcoverage.py | 2 +- .../test_pydevd_io.py | 0 .../test_save_locals.py | 0 .../test_tracing_gotchas.py | 4 +-- .../test_tracing_on_top_level.py | 4 +-- .../tests_single_notification.py | 2 +- .../not_in_default_pythonpath.txt | 0 .../samples/.cvsignore | 0 .../samples/nested_dir/.cvsignore | 0 .../samples/nested_dir/__init__.py | 0 .../samples/nested_dir/nested2/.cvsignore | 0 .../samples/nested_dir/nested2/__init__.py | 0 .../nested_dir/nested2/deep_nest_test.py | 0 .../nested_dir/nested2/non_test_file.py | 0 .../samples/nested_dir/nested3/.cvsignore | 0 .../samples/nested_dir/nested3/__init__.py | 0 .../samples/nested_dir/nested3/junk.txt | 0 .../nested_dir/nested3/non_test_file.py | 0 .../samples/nested_dir/non_test_file.py | 0 .../samples/nested_dir/simple4_test.py | 0 .../samples/non_test_file.py | 0 .../samples/not_in_default_pythonpath.txt | 0 .../samples/simple2_test.py | 0 .../samples/simple3_test.py | 0 .../samples/simpleClass_test.py | 0 .../samples/simpleModule_test.py | 0 .../samples/simple_test.py | 0 .../test_pydevd_property.py | 0 .../test_pydevdio.py | 0 .../test_runfiles.py | 2 +- python/helpers/pydev/pytest.ini | 2 +- .../env/python/debug/PythonDebuggerTest.java | 8 ++--- 197 files changed, 53 insertions(+), 53 deletions(-) rename python/helpers/pydev/{test_pydevd_reload => pydev_test_pydevd_reload}/__init__.py (100%) rename python/helpers/pydev/{test_pydevd_reload => pydev_test_pydevd_reload}/test_pydevd_reload.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/__init__.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_check_pydevconsole.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_get_referrers.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_jyserver.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_jysimpleTipper.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_pydev_ipython_011.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_pydevconsole.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_pyserver.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_signature.py (100%) rename python/helpers/pydev/{tests => pydev_tests}/test_simpleTipper.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/README (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/__init__.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-glut.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-gtk.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-gtk3.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-pyglet.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-qt.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-tk.py (100%) rename python/helpers/pydev/{tests_mainloop => pydev_tests_mainloop}/gui-wx.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/_debugger_case20.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/_debugger_case_breakpoint.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/_debugger_case_breakpoint2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/debug_constants.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/debugger_fixtures.py (97%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/debugger_unittest.py (99%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/flask1/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/flask1/app.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/flask1/templates/hello.html (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/manage.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/admin.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/forms.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/models.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/templates/my_app/index.html (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/templates/my_app/name.html (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/tests.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/urls.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_app/views.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_django_proj_17/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_django_proj_17/settings.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_django_proj_17/urls.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_17/my_django_proj_17/wsgi.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/manage.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/admin.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/apps.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/forms.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/migrations/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/models.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/templates/my_app/index.html (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/templates/my_app/name.html (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/urls.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_app/views.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_django_proj_21/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_django_proj_21/settings.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_django_proj_21/urls.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_django_proj_21/my_django_proj_21/wsgi.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_extensions/pydevd_plugins/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_extensions/pydevd_plugins/extensions/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/performance_check.py (98%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/regression_check.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/__init__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_bytecode_many_names_example.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_bytecode_overflow_example.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case1.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case13.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case14.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case15.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case15_execfile.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case16.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case17.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case17a.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case18.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case19.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case20.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case3.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case4.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case56.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case7.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case89.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_breakpoint.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_breakpoint2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_breakpoint_condition_exc.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_breakpoint_remote.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_breakpoint_remote_no_import.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_change_breaks.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_check_tracer.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_event_ext.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_exceptions.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_frame_eval.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_generator_py2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_generator_py3.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_get_next_statement_targets.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_get_thread_stack.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_import_imported.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_import_main.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_lamda.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_m_switch.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_m_switch_2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_module_entry_point.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_multiple_threads.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_multiprocessing.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_path_translation.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_print.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_qthread1.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_qthread2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_qthread3.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_qthread4.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_redirect.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_remote.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_remote_1.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_remote_2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_remote_unhandled_exceptions.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_remote_unhandled_exceptions2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_return_value.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_scapy.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_set_next_statement.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_settrace.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_simple_calls.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_skip_breakpoint_in_exceptions.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_suspend_all.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_suspend_policy.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_thread_creation_deadlock.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_trace_dispatch.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_type_ext.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_unhandled_exception_get_stack.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_unhandled_exceptions.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_unhandled_exceptions_on_top_level.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_unhandled_exceptions_on_top_level2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_debugger_case_zip_files.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_performance_1.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_performance_2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_performance_3.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_pydev_coverage_cyrillic_encoding_py2.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_pydev_coverage_cyrillic_encoding_py3.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/_pydev_coverage_syntax_error.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/launch/foo/__main__.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/resources/launch/foo/bar.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_additional_thread_info.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_bytecode_modification.py (99%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info.py (99%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info/test_collect_try_except_info.json (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info/test_iter_bytecode.py26.json (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info/test_iter_bytecode.py27.json (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info/test_iter_bytecode.py36.json (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_collect_try_except_info/test_iter_bytecode.py37.json (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_convert_utilities.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_debugger.py (98%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_dump_threads.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_frame_eval_and_tracing.py (96%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_frame_evaluator.py (94%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_in_project_roots.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_null.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_process_command_line.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_pydev_monkey.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_pydevcoverage.py (96%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_pydevd_io.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_save_locals.py (100%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_tracing_gotchas.py (95%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/test_tracing_on_top_level.py (98%) rename python/helpers/pydev/{tests_python => pydev_tests_python}/tests_single_notification.py (99%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/not_in_default_pythonpath.txt (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/.cvsignore (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/.cvsignore (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/__init__.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested2/.cvsignore (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested2/__init__.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested2/deep_nest_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested2/non_test_file.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested3/.cvsignore (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested3/__init__.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested3/junk.txt (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/nested3/non_test_file.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/non_test_file.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/nested_dir/simple4_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/non_test_file.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/not_in_default_pythonpath.txt (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/simple2_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/simple3_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/simpleClass_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/simpleModule_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/samples/simple_test.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/test_pydevd_property.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/test_pydevdio.py (100%) rename python/helpers/pydev/{tests_runfiles => pydev_tests_runfiles}/test_runfiles.py (99%) diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy index 3d46abb2b092..350a3c2a721d 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy @@ -57,7 +57,7 @@ abstract class PyCharmPropertiesBase extends ProductProperties { context.ant.copy(todir: "$targetDirectory/helpers") { fileset(dir: "$context.paths.communityHome/python/helpers") { exclude(name: "**/setup.py") - exclude(name: "pydev/test**/**") + exclude(name: "pydev/pydev_test*") exclude(name: "tests/") } } diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py index bb5555bb7d30..c2363ea7a2ae 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py @@ -275,7 +275,7 @@ if sys.version_info[:2] in ((3, 3), (3, 4), (3, 5)) or sys.version_info < (2, 7, def NO_FTRACE(frame, event, arg): # In Python < 2.7.12 and <= 3.5, if we're tracing a method, frame.f_trace may not be set # to None, it must always be set to a tracing function. - # See: tests_python.test_tracing_gotchas.test_tracing_gotchas + # See: pydev_tests_python.test_tracing_gotchas.test_tracing_gotchas return None diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_trace_dispatch_regular.py b/python/helpers/pydev/_pydevd_bundle/pydevd_trace_dispatch_regular.py index ebc0b9915693..87b01fa03924 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_trace_dispatch_regular.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_trace_dispatch_regular.py @@ -318,7 +318,7 @@ class TopLevelThreadTracerNoBackFrame: else: # Note: check all, not only the "valid" ones to cover the case - # in "tests_python.test_tracing_on_top_level.raise_unhandled10" + # in "pydev_tests_python.test_tracing_on_top_level.raise_unhandled10" # where one try..except is inside the other with only a raise # and it's gotten in the except line. for try_except_info in self._try_except_info: diff --git a/python/helpers/pydev/build_tools/generate_code.py b/python/helpers/pydev/build_tools/generate_code.py index ed7daa04b761..7d9e91f1cc01 100644 --- a/python/helpers/pydev/build_tools/generate_code.py +++ b/python/helpers/pydev/build_tools/generate_code.py @@ -129,11 +129,11 @@ if IS_PY3K: 'pydevd_attach_to_process', 'pydev_sitecustomize', 'stubs', - 'tests', - 'tests_mainloop', - 'tests_python', - 'tests_runfiles', - 'test_pydevd_reload', + 'pydev_tests', + 'pydev_tests_mainloop', + 'pydev_tests_python', + 'pydev_tests_runfiles', + 'pydev_test_pydevd_reload', 'third_party', '__pycache__', '_pydev_runfiles', diff --git a/python/helpers/pydev/test_pydevd_reload/__init__.py b/python/helpers/pydev/pydev_test_pydevd_reload/__init__.py similarity index 100% rename from python/helpers/pydev/test_pydevd_reload/__init__.py rename to python/helpers/pydev/pydev_test_pydevd_reload/__init__.py diff --git a/python/helpers/pydev/test_pydevd_reload/test_pydevd_reload.py b/python/helpers/pydev/pydev_test_pydevd_reload/test_pydevd_reload.py similarity index 100% rename from python/helpers/pydev/test_pydevd_reload/test_pydevd_reload.py rename to python/helpers/pydev/pydev_test_pydevd_reload/test_pydevd_reload.py diff --git a/python/helpers/pydev/tests/__init__.py b/python/helpers/pydev/pydev_tests/__init__.py similarity index 100% rename from python/helpers/pydev/tests/__init__.py rename to python/helpers/pydev/pydev_tests/__init__.py diff --git a/python/helpers/pydev/tests/test_check_pydevconsole.py b/python/helpers/pydev/pydev_tests/test_check_pydevconsole.py similarity index 100% rename from python/helpers/pydev/tests/test_check_pydevconsole.py rename to python/helpers/pydev/pydev_tests/test_check_pydevconsole.py diff --git a/python/helpers/pydev/tests/test_get_referrers.py b/python/helpers/pydev/pydev_tests/test_get_referrers.py similarity index 100% rename from python/helpers/pydev/tests/test_get_referrers.py rename to python/helpers/pydev/pydev_tests/test_get_referrers.py diff --git a/python/helpers/pydev/tests/test_jyserver.py b/python/helpers/pydev/pydev_tests/test_jyserver.py similarity index 100% rename from python/helpers/pydev/tests/test_jyserver.py rename to python/helpers/pydev/pydev_tests/test_jyserver.py diff --git a/python/helpers/pydev/tests/test_jysimpleTipper.py b/python/helpers/pydev/pydev_tests/test_jysimpleTipper.py similarity index 100% rename from python/helpers/pydev/tests/test_jysimpleTipper.py rename to python/helpers/pydev/pydev_tests/test_jysimpleTipper.py diff --git a/python/helpers/pydev/tests/test_pydev_ipython_011.py b/python/helpers/pydev/pydev_tests/test_pydev_ipython_011.py similarity index 100% rename from python/helpers/pydev/tests/test_pydev_ipython_011.py rename to python/helpers/pydev/pydev_tests/test_pydev_ipython_011.py diff --git a/python/helpers/pydev/tests/test_pydevconsole.py b/python/helpers/pydev/pydev_tests/test_pydevconsole.py similarity index 100% rename from python/helpers/pydev/tests/test_pydevconsole.py rename to python/helpers/pydev/pydev_tests/test_pydevconsole.py diff --git a/python/helpers/pydev/tests/test_pyserver.py b/python/helpers/pydev/pydev_tests/test_pyserver.py similarity index 100% rename from python/helpers/pydev/tests/test_pyserver.py rename to python/helpers/pydev/pydev_tests/test_pyserver.py diff --git a/python/helpers/pydev/tests/test_signature.py b/python/helpers/pydev/pydev_tests/test_signature.py similarity index 100% rename from python/helpers/pydev/tests/test_signature.py rename to python/helpers/pydev/pydev_tests/test_signature.py diff --git a/python/helpers/pydev/tests/test_simpleTipper.py b/python/helpers/pydev/pydev_tests/test_simpleTipper.py similarity index 100% rename from python/helpers/pydev/tests/test_simpleTipper.py rename to python/helpers/pydev/pydev_tests/test_simpleTipper.py diff --git a/python/helpers/pydev/tests_mainloop/README b/python/helpers/pydev/pydev_tests_mainloop/README similarity index 100% rename from python/helpers/pydev/tests_mainloop/README rename to python/helpers/pydev/pydev_tests_mainloop/README diff --git a/python/helpers/pydev/tests_mainloop/__init__.py b/python/helpers/pydev/pydev_tests_mainloop/__init__.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/__init__.py rename to python/helpers/pydev/pydev_tests_mainloop/__init__.py diff --git a/python/helpers/pydev/tests_mainloop/gui-glut.py b/python/helpers/pydev/pydev_tests_mainloop/gui-glut.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-glut.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-glut.py diff --git a/python/helpers/pydev/tests_mainloop/gui-gtk.py b/python/helpers/pydev/pydev_tests_mainloop/gui-gtk.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-gtk.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-gtk.py diff --git a/python/helpers/pydev/tests_mainloop/gui-gtk3.py b/python/helpers/pydev/pydev_tests_mainloop/gui-gtk3.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-gtk3.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-gtk3.py diff --git a/python/helpers/pydev/tests_mainloop/gui-pyglet.py b/python/helpers/pydev/pydev_tests_mainloop/gui-pyglet.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-pyglet.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-pyglet.py diff --git a/python/helpers/pydev/tests_mainloop/gui-qt.py b/python/helpers/pydev/pydev_tests_mainloop/gui-qt.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-qt.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-qt.py diff --git a/python/helpers/pydev/tests_mainloop/gui-tk.py b/python/helpers/pydev/pydev_tests_mainloop/gui-tk.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-tk.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-tk.py diff --git a/python/helpers/pydev/tests_mainloop/gui-wx.py b/python/helpers/pydev/pydev_tests_mainloop/gui-wx.py similarity index 100% rename from python/helpers/pydev/tests_mainloop/gui-wx.py rename to python/helpers/pydev/pydev_tests_mainloop/gui-wx.py diff --git a/python/helpers/pydev/tests_python/__init__.py b/python/helpers/pydev/pydev_tests_python/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/__init__.py rename to python/helpers/pydev/pydev_tests_python/__init__.py diff --git a/python/helpers/pydev/tests_python/_debugger_case20.py b/python/helpers/pydev/pydev_tests_python/_debugger_case20.py similarity index 100% rename from python/helpers/pydev/tests_python/_debugger_case20.py rename to python/helpers/pydev/pydev_tests_python/_debugger_case20.py diff --git a/python/helpers/pydev/tests_python/_debugger_case_breakpoint.py b/python/helpers/pydev/pydev_tests_python/_debugger_case_breakpoint.py similarity index 100% rename from python/helpers/pydev/tests_python/_debugger_case_breakpoint.py rename to python/helpers/pydev/pydev_tests_python/_debugger_case_breakpoint.py diff --git a/python/helpers/pydev/tests_python/_debugger_case_breakpoint2.py b/python/helpers/pydev/pydev_tests_python/_debugger_case_breakpoint2.py similarity index 100% rename from python/helpers/pydev/tests_python/_debugger_case_breakpoint2.py rename to python/helpers/pydev/pydev_tests_python/_debugger_case_breakpoint2.py diff --git a/python/helpers/pydev/tests_python/debug_constants.py b/python/helpers/pydev/pydev_tests_python/debug_constants.py similarity index 100% rename from python/helpers/pydev/tests_python/debug_constants.py rename to python/helpers/pydev/pydev_tests_python/debug_constants.py diff --git a/python/helpers/pydev/tests_python/debugger_fixtures.py b/python/helpers/pydev/pydev_tests_python/debugger_fixtures.py similarity index 97% rename from python/helpers/pydev/tests_python/debugger_fixtures.py rename to python/helpers/pydev/pydev_tests_python/debugger_fixtures.py index f7d5a5b7e095..aa0b07e5684a 100644 --- a/python/helpers/pydev/tests_python/debugger_fixtures.py +++ b/python/helpers/pydev/pydev_tests_python/debugger_fixtures.py @@ -5,8 +5,8 @@ import time import pytest -from tests_python import debugger_unittest -from tests_python.debugger_unittest import get_free_port, overrides, IS_CPYTHON, IS_JYTHON, IS_IRONPYTHON, \ +from pydev_tests_python import debugger_unittest +from pydev_tests_python.debugger_unittest import get_free_port, overrides, IS_CPYTHON, IS_JYTHON, IS_IRONPYTHON, \ IS_PY3K import sys @@ -33,7 +33,7 @@ def get_jython_jar(): class _WriterThreadCaseMSwitch(debugger_unittest.AbstractWriterThread): - TEST_FILE = 'tests_python.resources._debugger_case_m_switch' + TEST_FILE = 'pydev_tests_python.resources._debugger_case_m_switch' IS_MODULE = True @overrides(debugger_unittest.AbstractWriterThread.get_environ) @@ -54,7 +54,7 @@ class _WriterThreadCaseMSwitch(debugger_unittest.AbstractWriterThread): class _WriterThreadCaseModuleWithEntryPoint(_WriterThreadCaseMSwitch): - TEST_FILE = 'tests_python.resources._debugger_case_module_entry_point:main' + TEST_FILE = 'pydev_tests_python.resources._debugger_case_module_entry_point:main' IS_MODULE = True @overrides(_WriterThreadCaseMSwitch.get_main_filename) diff --git a/python/helpers/pydev/tests_python/debugger_unittest.py b/python/helpers/pydev/pydev_tests_python/debugger_unittest.py similarity index 99% rename from python/helpers/pydev/tests_python/debugger_unittest.py rename to python/helpers/pydev/pydev_tests_python/debugger_unittest.py index c2a33cc84355..d620d3ca5646 100644 --- a/python/helpers/pydev/tests_python/debugger_unittest.py +++ b/python/helpers/pydev/pydev_tests_python/debugger_unittest.py @@ -13,7 +13,7 @@ import sys import threading import time import traceback -from tests_python.debug_constants import * +from pydev_tests_python.debug_constants import * from _pydev_bundle import pydev_localhost diff --git a/python/helpers/pydev/tests_python/flask1/__init__.py b/python/helpers/pydev/pydev_tests_python/flask1/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/flask1/__init__.py rename to python/helpers/pydev/pydev_tests_python/flask1/__init__.py diff --git a/python/helpers/pydev/tests_python/flask1/app.py b/python/helpers/pydev/pydev_tests_python/flask1/app.py similarity index 100% rename from python/helpers/pydev/tests_python/flask1/app.py rename to python/helpers/pydev/pydev_tests_python/flask1/app.py diff --git a/python/helpers/pydev/tests_python/flask1/templates/hello.html b/python/helpers/pydev/pydev_tests_python/flask1/templates/hello.html similarity index 100% rename from python/helpers/pydev/tests_python/flask1/templates/hello.html rename to python/helpers/pydev/pydev_tests_python/flask1/templates/hello.html diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/manage.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/manage.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/manage.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/manage.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/__init__.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/__init__.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/admin.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/admin.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/admin.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/admin.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/forms.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/forms.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/forms.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/forms.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/models.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/models.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/models.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/models.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/index.html b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/templates/my_app/index.html similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/index.html rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/templates/my_app/index.html diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/name.html b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/templates/my_app/name.html similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/templates/my_app/name.html rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/templates/my_app/name.html diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/tests.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/tests.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/tests.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/tests.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/urls.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/urls.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/urls.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/urls.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_app/views.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/views.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_app/views.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_app/views.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/__init__.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/__init__.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/settings.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/settings.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/settings.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/settings.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/urls.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/urls.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/urls.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/urls.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/wsgi.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/wsgi.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_17/my_django_proj_17/wsgi.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_17/my_django_proj_17/wsgi.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/manage.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/manage.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/manage.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/manage.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/__init__.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/__init__.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/admin.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/admin.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/admin.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/admin.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/apps.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/apps.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/apps.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/apps.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/forms.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/forms.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/forms.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/forms.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/migrations/__init__.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/migrations/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/migrations/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/migrations/__init__.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/models.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/models.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/models.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/models.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/templates/my_app/index.html b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/templates/my_app/index.html similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/templates/my_app/index.html rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/templates/my_app/index.html diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/templates/my_app/name.html b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/templates/my_app/name.html similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/templates/my_app/name.html rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/templates/my_app/name.html diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/urls.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/urls.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/urls.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/urls.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_app/views.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/views.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_app/views.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_app/views.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/__init__.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/__init__.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/settings.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/settings.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/settings.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/settings.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/urls.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/urls.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/urls.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/urls.py diff --git a/python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/wsgi.py b/python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/wsgi.py similarity index 100% rename from python/helpers/pydev/tests_python/my_django_proj_21/my_django_proj_21/wsgi.py rename to python/helpers/pydev/pydev_tests_python/my_django_proj_21/my_django_proj_21/wsgi.py diff --git a/python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/__init__.py b/python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/__init__.py diff --git a/python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py b/python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py rename to python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/__init__.py diff --git a/python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py b/python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py similarity index 100% rename from python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py rename to python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py diff --git a/python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py b/python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py similarity index 100% rename from python/helpers/pydev/tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py rename to python/helpers/pydev/pydev_tests_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py diff --git a/python/helpers/pydev/tests_python/performance_check.py b/python/helpers/pydev/pydev_tests_python/performance_check.py similarity index 98% rename from python/helpers/pydev/tests_python/performance_check.py rename to python/helpers/pydev/pydev_tests_python/performance_check.py index 0e05a01fdd7d..dedfdd9e6768 100644 --- a/python/helpers/pydev/tests_python/performance_check.py +++ b/python/helpers/pydev/pydev_tests_python/performance_check.py @@ -1,4 +1,4 @@ -from tests_python import debugger_unittest +from pydev_tests_python import debugger_unittest import sys import re import os @@ -6,7 +6,7 @@ import os CHECK_BASELINE, CHECK_REGULAR, CHECK_CYTHON, CHECK_FRAME_EVAL = 'baseline', 'regular', 'cython', 'frame_eval' pytest_plugins = [ - str('tests_python.debugger_fixtures'), + str('pydev_tests_python.debugger_fixtures'), ] RUNS = 5 diff --git a/python/helpers/pydev/tests_python/regression_check.py b/python/helpers/pydev/pydev_tests_python/regression_check.py similarity index 100% rename from python/helpers/pydev/tests_python/regression_check.py rename to python/helpers/pydev/pydev_tests_python/regression_check.py diff --git a/python/helpers/pydev/tests_python/resources/__init__.py b/python/helpers/pydev/pydev_tests_python/resources/__init__.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/__init__.py rename to python/helpers/pydev/pydev_tests_python/resources/__init__.py diff --git a/python/helpers/pydev/tests_python/resources/_bytecode_many_names_example.py b/python/helpers/pydev/pydev_tests_python/resources/_bytecode_many_names_example.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_bytecode_many_names_example.py rename to python/helpers/pydev/pydev_tests_python/resources/_bytecode_many_names_example.py diff --git a/python/helpers/pydev/tests_python/resources/_bytecode_overflow_example.py b/python/helpers/pydev/pydev_tests_python/resources/_bytecode_overflow_example.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_bytecode_overflow_example.py rename to python/helpers/pydev/pydev_tests_python/resources/_bytecode_overflow_example.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case1.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case1.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case1.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case1.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case13.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case13.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case13.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case13.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case14.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case14.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case14.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case14.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case15.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case15.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case15.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case15.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case15_execfile.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case15_execfile.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case15_execfile.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case15_execfile.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case16.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case16.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case16.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case16.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case17.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case17.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case17.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case17.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case17a.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case17a.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case17a.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case17a.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case18.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case18.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case18.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case18.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case19.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case19.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case19.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case19.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case20.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case20.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case20.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case20.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case3.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case3.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case3.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case3.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case4.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case4.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case4.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case4.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case56.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case56.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case56.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case56.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case7.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case7.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case7.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case7.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case89.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case89.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case89.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case89.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_condition_exc.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_condition_exc.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_condition_exc.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_condition_exc.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_remote.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_remote.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_remote_no_import.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote_no_import.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_breakpoint_remote_no_import.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_breakpoint_remote_no_import.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_change_breaks.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_change_breaks.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_change_breaks.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_change_breaks.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_check_tracer.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_check_tracer.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_check_tracer.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_check_tracer.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_event_ext.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_event_ext.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_event_ext.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_event_ext.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_exceptions.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_exceptions.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_exceptions.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_exceptions.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_frame_eval.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_frame_eval.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_frame_eval.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_frame_eval.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_generator_py2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_generator_py2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_generator_py2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_generator_py2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_generator_py3.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_generator_py3.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_generator_py3.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_generator_py3.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_get_next_statement_targets.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_get_next_statement_targets.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_get_next_statement_targets.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_get_next_statement_targets.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_get_thread_stack.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_get_thread_stack.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_get_thread_stack.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_get_thread_stack.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_import_imported.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_import_imported.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_import_imported.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_import_imported.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_import_main.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_import_main.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_import_main.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_import_main.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_lamda.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_lamda.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_lamda.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_lamda.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_m_switch.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_m_switch.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_m_switch.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_m_switch.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_m_switch_2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_m_switch_2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_m_switch_2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_m_switch_2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_module_entry_point.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_module_entry_point.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_module_entry_point.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_module_entry_point.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_multiple_threads.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_multiple_threads.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_multiple_threads.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_multiple_threads.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_multiprocessing.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_multiprocessing.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_multiprocessing.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_multiprocessing.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_path_translation.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_path_translation.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_path_translation.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_path_translation.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_print.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_print.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_print.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_print.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_qthread1.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread1.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_qthread1.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread1.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_qthread2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_qthread2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_qthread3.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread3.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_qthread3.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread3.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_qthread4.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread4.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_qthread4.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_qthread4.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_redirect.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_redirect.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_redirect.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_redirect.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_remote.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_remote.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_remote_1.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_1.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_remote_1.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_1.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_remote_2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_remote_2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_remote_unhandled_exceptions.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_unhandled_exceptions.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_remote_unhandled_exceptions.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_unhandled_exceptions.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_remote_unhandled_exceptions2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_unhandled_exceptions2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_remote_unhandled_exceptions2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_remote_unhandled_exceptions2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_return_value.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_return_value.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_return_value.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_return_value.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_scapy.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_scapy.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_scapy.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_scapy.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_set_next_statement.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_set_next_statement.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_set_next_statement.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_set_next_statement.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_settrace.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_settrace.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_settrace.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_settrace.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_simple_calls.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_simple_calls.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_simple_calls.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_simple_calls.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_skip_breakpoint_in_exceptions.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_skip_breakpoint_in_exceptions.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_skip_breakpoint_in_exceptions.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_skip_breakpoint_in_exceptions.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_suspend_all.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_suspend_all.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_suspend_all.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_suspend_all.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_suspend_policy.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_suspend_policy.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_suspend_policy.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_suspend_policy.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_thread_creation_deadlock.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_thread_creation_deadlock.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_thread_creation_deadlock.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_thread_creation_deadlock.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_trace_dispatch.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_trace_dispatch.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_trace_dispatch.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_trace_dispatch.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_type_ext.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_type_ext.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_type_ext.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_type_ext.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exception_get_stack.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exception_get_stack.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exception_get_stack.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exception_get_stack.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level2.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level2.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_unhandled_exceptions_on_top_level2.py diff --git a/python/helpers/pydev/tests_python/resources/_debugger_case_zip_files.py b/python/helpers/pydev/pydev_tests_python/resources/_debugger_case_zip_files.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_debugger_case_zip_files.py rename to python/helpers/pydev/pydev_tests_python/resources/_debugger_case_zip_files.py diff --git a/python/helpers/pydev/tests_python/resources/_performance_1.py b/python/helpers/pydev/pydev_tests_python/resources/_performance_1.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_performance_1.py rename to python/helpers/pydev/pydev_tests_python/resources/_performance_1.py diff --git a/python/helpers/pydev/tests_python/resources/_performance_2.py b/python/helpers/pydev/pydev_tests_python/resources/_performance_2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_performance_2.py rename to python/helpers/pydev/pydev_tests_python/resources/_performance_2.py diff --git a/python/helpers/pydev/tests_python/resources/_performance_3.py b/python/helpers/pydev/pydev_tests_python/resources/_performance_3.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_performance_3.py rename to python/helpers/pydev/pydev_tests_python/resources/_performance_3.py diff --git a/python/helpers/pydev/tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py b/python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py rename to python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_cyrillic_encoding_py2.py diff --git a/python/helpers/pydev/tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py b/python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py rename to python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_cyrillic_encoding_py3.py diff --git a/python/helpers/pydev/tests_python/resources/_pydev_coverage_syntax_error.py b/python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_syntax_error.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/_pydev_coverage_syntax_error.py rename to python/helpers/pydev/pydev_tests_python/resources/_pydev_coverage_syntax_error.py diff --git a/python/helpers/pydev/tests_python/resources/launch/foo/__main__.py b/python/helpers/pydev/pydev_tests_python/resources/launch/foo/__main__.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/launch/foo/__main__.py rename to python/helpers/pydev/pydev_tests_python/resources/launch/foo/__main__.py diff --git a/python/helpers/pydev/tests_python/resources/launch/foo/bar.py b/python/helpers/pydev/pydev_tests_python/resources/launch/foo/bar.py similarity index 100% rename from python/helpers/pydev/tests_python/resources/launch/foo/bar.py rename to python/helpers/pydev/pydev_tests_python/resources/launch/foo/bar.py diff --git a/python/helpers/pydev/tests_python/test_additional_thread_info.py b/python/helpers/pydev/pydev_tests_python/test_additional_thread_info.py similarity index 100% rename from python/helpers/pydev/tests_python/test_additional_thread_info.py rename to python/helpers/pydev/pydev_tests_python/test_additional_thread_info.py diff --git a/python/helpers/pydev/tests_python/test_bytecode_modification.py b/python/helpers/pydev/pydev_tests_python/test_bytecode_modification.py similarity index 99% rename from python/helpers/pydev/tests_python/test_bytecode_modification.py rename to python/helpers/pydev/pydev_tests_python/test_bytecode_modification.py index f61d226b2a8b..8c57c7df52ee 100644 --- a/python/helpers/pydev/tests_python/test_bytecode_modification.py +++ b/python/helpers/pydev/pydev_tests_python/test_bytecode_modification.py @@ -459,7 +459,7 @@ class TestInsertCode(unittest.TestCase): sys.stdout = StringIO() try: - from tests_python.resources._bytecode_many_names_example import foo + from pydev_tests_python.resources._bytecode_many_names_example import foo self.check_insert_to_line_with_exec(foo, tracing, foo.__code__.co_firstlineno + 2) finally: @@ -467,7 +467,7 @@ class TestInsertCode(unittest.TestCase): def test_extended_arg_overflow(self): - from tests_python.resources._bytecode_overflow_example import Dummy, DummyTracing + from pydev_tests_python.resources._bytecode_overflow_example import Dummy, DummyTracing self.check_insert_to_line_by_symbols(Dummy.fun, call_tracing, Dummy.fun.__code__.co_firstlineno + 3, DummyTracing.fun.__code__) diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info.py b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info.py similarity index 99% rename from python/helpers/pydev/tests_python/test_collect_try_except_info.py rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info.py index ec7c1cde00cb..6322bedff087 100644 --- a/python/helpers/pydev/tests_python/test_collect_try_except_info.py +++ b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info.py @@ -4,7 +4,7 @@ import sys import traceback from _pydevd_bundle.pydevd_collect_try_except_info import collect_try_except_info -from tests_python.debugger_unittest import IS_CPYTHON +from pydev_tests_python.debugger_unittest import IS_CPYTHON def _method_call_with_error(): diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info/test_collect_try_except_info.json b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_collect_try_except_info.json similarity index 100% rename from python/helpers/pydev/tests_python/test_collect_try_except_info/test_collect_try_except_info.json rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_collect_try_except_info.json diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py26.json b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py26.json similarity index 100% rename from python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py26.json rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py26.json diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py27.json b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py27.json similarity index 100% rename from python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py27.json rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py27.json diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py36.json b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py36.json similarity index 100% rename from python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py36.json rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py36.json diff --git a/python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py37.json b/python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py37.json similarity index 100% rename from python/helpers/pydev/tests_python/test_collect_try_except_info/test_iter_bytecode.py37.json rename to python/helpers/pydev/pydev_tests_python/test_collect_try_except_info/test_iter_bytecode.py37.json diff --git a/python/helpers/pydev/tests_python/test_convert_utilities.py b/python/helpers/pydev/pydev_tests_python/test_convert_utilities.py similarity index 100% rename from python/helpers/pydev/tests_python/test_convert_utilities.py rename to python/helpers/pydev/pydev_tests_python/test_convert_utilities.py diff --git a/python/helpers/pydev/tests_python/test_debugger.py b/python/helpers/pydev/pydev_tests_python/test_debugger.py similarity index 98% rename from python/helpers/pydev/tests_python/test_debugger.py rename to python/helpers/pydev/pydev_tests_python/test_debugger.py index a4cd4b20c0d2..551987b3d585 100644 --- a/python/helpers/pydev/tests_python/test_debugger.py +++ b/python/helpers/pydev/pydev_tests_python/test_debugger.py @@ -10,23 +10,23 @@ import time import pytest -from tests_python import debugger_unittest -from tests_python.debugger_unittest import (CMD_SET_PROPERTY_TRACE, REASON_CAUGHT_EXCEPTION, - REASON_UNCAUGHT_EXCEPTION, REASON_STOP_ON_BREAKPOINT, REASON_THREAD_SUSPEND, overrides, CMD_THREAD_CREATE, - CMD_GET_THREAD_STACK, REASON_STEP_INTO_MY_CODE, CMD_GET_EXCEPTION_DETAILS, IS_IRONPYTHON, IS_JYTHON, IS_CPYTHON, - IS_APPVEYOR, wait_for_condition, CMD_GET_FRAME, CMD_GET_BREAKPOINT_EXCEPTION, - CMD_THREAD_SUSPEND, CMD_STEP_OVER, REASON_STEP_OVER, CMD_THREAD_SUSPEND_SINGLE_NOTIFICATION, - CMD_THREAD_RESUME_SINGLE_NOTIFICATION, IS_PY37_OR_GREATER) +from pydev_tests_python import debugger_unittest +from pydev_tests_python.debugger_unittest import (CMD_SET_PROPERTY_TRACE, REASON_CAUGHT_EXCEPTION, + REASON_UNCAUGHT_EXCEPTION, REASON_STOP_ON_BREAKPOINT, REASON_THREAD_SUSPEND, overrides, CMD_THREAD_CREATE, + CMD_GET_THREAD_STACK, REASON_STEP_INTO_MY_CODE, CMD_GET_EXCEPTION_DETAILS, IS_IRONPYTHON, IS_JYTHON, IS_CPYTHON, + IS_APPVEYOR, wait_for_condition, CMD_GET_FRAME, CMD_GET_BREAKPOINT_EXCEPTION, + CMD_THREAD_SUSPEND, CMD_STEP_OVER, REASON_STEP_OVER, CMD_THREAD_SUSPEND_SINGLE_NOTIFICATION, + CMD_THREAD_RESUME_SINGLE_NOTIFICATION, IS_PY37_OR_GREATER) from _pydevd_bundle.pydevd_constants import IS_WINDOWS try: from urllib import unquote except ImportError: from urllib.parse import unquote -from tests_python.debug_constants import * +from pydev_tests_python.debug_constants import * pytest_plugins = [ - str('tests_python.debugger_fixtures'), + str('pydev_tests_python.debugger_fixtures'), ] try: @@ -1742,11 +1742,11 @@ def test_path_translation(case_setup): return env with case_setup.test_file('_debugger_case_path_translation.py', get_environ=get_environ) as writer: - from tests_python.debugger_unittest import CMD_LOAD_SOURCE + from pydev_tests_python.debugger_unittest import CMD_LOAD_SOURCE writer.write_start_redirect() file_in_client = get_file_in_client(writer) - assert 'tests_python' not in file_in_client + assert 'pydev_tests_python' not in file_in_client writer.write_add_breakpoint(2, 'main', filename=file_in_client) writer.write_make_initial_run() @@ -1916,7 +1916,7 @@ def test_case_get_thread_stack(case_setup): def test_case_dump_threads_to_stderr(case_setup): - from tests_python.debugger_unittest import wait_for_condition + from pydev_tests_python.debugger_unittest import wait_for_condition def additional_output_checks(writer, stdout, stderr): assert is_stderr_ok(stderr), make_error_msg(stderr) @@ -2081,7 +2081,7 @@ def test_debug_zip_files(case_setup, tmpdir): @pytest.mark.skipif(not IS_CPYTHON, reason='CPython only test.') def test_multiprocessing(case_setup_multiprocessing): import threading - from tests_python.debugger_unittest import AbstractWriterThread + from pydev_tests_python.debugger_unittest import AbstractWriterThread with case_setup_multiprocessing.test_file('_debugger_case_multiprocessing.py') as writer: break1_line = writer.get_line_index_with_content('break 1 here') break2_line = writer.get_line_index_with_content('break 2 here') @@ -2099,7 +2099,7 @@ def test_multiprocessing(case_setup_multiprocessing): class SecondaryProcessThreadCommunication(threading.Thread): def run(self): - from tests_python.debugger_unittest import ReaderThread + from pydev_tests_python.debugger_unittest import ReaderThread server_socket.listen(1) self.server_socket = server_socket new_sock, addr = server_socket.accept() @@ -2229,7 +2229,7 @@ def test_remote_debugger_multi_proc(case_setup_remote): self.sock, addr = self.server_socket.accept() print('accepted second process') - from tests_python.debugger_unittest import ReaderThread + from pydev_tests_python.debugger_unittest import ReaderThread self.reader_thread = ReaderThread(self.sock) self.reader_thread.start() @@ -2343,7 +2343,7 @@ def test_trace_dispatch_correct(case_setup): @pytest.mark.skipif(IS_PY26, reason='Failing on Python 2.6 on travis (needs investigation).') def test_case_single_notification_on_step(case_setup): - from tests_python.debugger_unittest import REASON_STEP_INTO + from pydev_tests_python.debugger_unittest import REASON_STEP_INTO with case_setup.test_file('_debugger_case_import_main.py') as writer: writer.write_multi_threads_single_notification(True) writer.write_add_breakpoint(writer.get_line_index_with_content('break here'), '') @@ -2390,7 +2390,7 @@ def test_return_value(case_setup): @pytest.mark.skipif(IS_JYTHON, reason='Jython can only have one thread stopped at each time.') @pytest.mark.parametrize('check_single_notification', [True, False]) def test_run_pause_all_threads_single_notification(case_setup, check_single_notification): - from tests_python.debugger_unittest import TimeoutError + from pydev_tests_python.debugger_unittest import TimeoutError with case_setup.test_file('_debugger_case_multiple_threads.py') as writer: # : :type writer: AbstractWriterThread writer.write_multi_threads_single_notification(True) diff --git a/python/helpers/pydev/tests_python/test_dump_threads.py b/python/helpers/pydev/pydev_tests_python/test_dump_threads.py similarity index 100% rename from python/helpers/pydev/tests_python/test_dump_threads.py rename to python/helpers/pydev/pydev_tests_python/test_dump_threads.py diff --git a/python/helpers/pydev/tests_python/test_frame_eval_and_tracing.py b/python/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py similarity index 96% rename from python/helpers/pydev/tests_python/test_frame_eval_and_tracing.py rename to python/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py index 7ff3af383c2a..9b1fa9bec37b 100644 --- a/python/helpers/pydev/tests_python/test_frame_eval_and_tracing.py +++ b/python/helpers/pydev/pydev_tests_python/test_frame_eval_and_tracing.py @@ -4,11 +4,11 @@ import pytest import time from contextlib import contextmanager -from tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON -from tests_python.debug_constants import TEST_CYTHON +from pydev_tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON +from pydev_tests_python.debug_constants import TEST_CYTHON pytest_plugins = [ - str('tests_python.debugger_fixtures'), + str('pydev_tests_python.debugger_fixtures'), ] pytestmark = pytest.mark.skipif(not IS_PY36_OR_GREATER or not IS_CPYTHON or not TEST_CYTHON, reason='Requires CPython >= 3.6') @@ -188,7 +188,7 @@ def test_add_termination_exc_break(case_setup_force_frame_eval): def test_frame_eval_whitebox_test(case_setup_force_frame_eval): - from tests_python.debugger_unittest import CMD_STEP_INTO, CMD_STEP_RETURN, CMD_STEP_OVER + from pydev_tests_python.debugger_unittest import CMD_STEP_INTO, CMD_STEP_RETURN, CMD_STEP_OVER with case_setup_force_frame_eval.test_file('_debugger_case_frame_eval.py') as writer: line_on_global = writer.get_line_index_with_content('break on global') diff --git a/python/helpers/pydev/tests_python/test_frame_evaluator.py b/python/helpers/pydev/pydev_tests_python/test_frame_evaluator.py similarity index 94% rename from python/helpers/pydev/tests_python/test_frame_evaluator.py rename to python/helpers/pydev/pydev_tests_python/test_frame_evaluator.py index a31a74799fac..b34df90486c3 100644 --- a/python/helpers/pydev/tests_python/test_frame_evaluator.py +++ b/python/helpers/pydev/pydev_tests_python/test_frame_evaluator.py @@ -1,8 +1,8 @@ import sys import threading import pytest -from tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON -from tests_python.debug_constants import TEST_CYTHON +from pydev_tests_python.debugger_unittest import IS_PY36_OR_GREATER, IS_CPYTHON +from pydev_tests_python.debug_constants import TEST_CYTHON pytestmark = pytest.mark.skipif(not IS_PY36_OR_GREATER or not IS_CPYTHON or not TEST_CYTHON, reason='Requires CPython >= 3.6') diff --git a/python/helpers/pydev/tests_python/test_in_project_roots.py b/python/helpers/pydev/pydev_tests_python/test_in_project_roots.py similarity index 100% rename from python/helpers/pydev/tests_python/test_in_project_roots.py rename to python/helpers/pydev/pydev_tests_python/test_in_project_roots.py diff --git a/python/helpers/pydev/tests_python/test_null.py b/python/helpers/pydev/pydev_tests_python/test_null.py similarity index 100% rename from python/helpers/pydev/tests_python/test_null.py rename to python/helpers/pydev/pydev_tests_python/test_null.py diff --git a/python/helpers/pydev/tests_python/test_process_command_line.py b/python/helpers/pydev/pydev_tests_python/test_process_command_line.py similarity index 100% rename from python/helpers/pydev/tests_python/test_process_command_line.py rename to python/helpers/pydev/pydev_tests_python/test_process_command_line.py diff --git a/python/helpers/pydev/tests_python/test_pydev_monkey.py b/python/helpers/pydev/pydev_tests_python/test_pydev_monkey.py similarity index 100% rename from python/helpers/pydev/tests_python/test_pydev_monkey.py rename to python/helpers/pydev/pydev_tests_python/test_pydev_monkey.py diff --git a/python/helpers/pydev/tests_python/test_pydevcoverage.py b/python/helpers/pydev/pydev_tests_python/test_pydevcoverage.py similarity index 96% rename from python/helpers/pydev/tests_python/test_pydevcoverage.py rename to python/helpers/pydev/pydev_tests_python/test_pydevcoverage.py index 9563b1aceda8..18d0c587f9e4 100644 --- a/python/helpers/pydev/tests_python/test_pydevcoverage.py +++ b/python/helpers/pydev/pydev_tests_python/test_pydevcoverage.py @@ -20,7 +20,7 @@ class Test(unittest.TestCase): def setUp(self): unittest.TestCase.setUp(self) project_path = os.path.dirname(os.path.dirname(__file__)) - self._resources_path = os.path.join(project_path, "tests_python", "resources") + self._resources_path = os.path.join(project_path, "pydev_tests_python", "resources") self._coverage_file = os.path.join(project_path, "pydev_coverage.py") def _do_analyze(self, files): diff --git a/python/helpers/pydev/tests_python/test_pydevd_io.py b/python/helpers/pydev/pydev_tests_python/test_pydevd_io.py similarity index 100% rename from python/helpers/pydev/tests_python/test_pydevd_io.py rename to python/helpers/pydev/pydev_tests_python/test_pydevd_io.py diff --git a/python/helpers/pydev/tests_python/test_save_locals.py b/python/helpers/pydev/pydev_tests_python/test_save_locals.py similarity index 100% rename from python/helpers/pydev/tests_python/test_save_locals.py rename to python/helpers/pydev/pydev_tests_python/test_save_locals.py diff --git a/python/helpers/pydev/tests_python/test_tracing_gotchas.py b/python/helpers/pydev/pydev_tests_python/test_tracing_gotchas.py similarity index 95% rename from python/helpers/pydev/tests_python/test_tracing_gotchas.py rename to python/helpers/pydev/pydev_tests_python/test_tracing_gotchas.py index 2d6176136dcb..2f0e92616da3 100644 --- a/python/helpers/pydev/tests_python/test_tracing_gotchas.py +++ b/python/helpers/pydev/pydev_tests_python/test_tracing_gotchas.py @@ -1,8 +1,8 @@ import pytest import sys -from tests_python.test_debugger import IS_PY26, IS_PY34 +from pydev_tests_python.test_debugger import IS_PY26, IS_PY34 from _pydevd_bundle.pydevd_constants import NO_FTRACE -from tests_python.debugger_unittest import IS_JYTHON +from pydev_tests_python.debugger_unittest import IS_JYTHON class Tracer(object): diff --git a/python/helpers/pydev/tests_python/test_tracing_on_top_level.py b/python/helpers/pydev/pydev_tests_python/test_tracing_on_top_level.py similarity index 98% rename from python/helpers/pydev/tests_python/test_tracing_on_top_level.py rename to python/helpers/pydev/pydev_tests_python/test_tracing_on_top_level.py index f4db3e1e39ad..59b8f6defa3d 100644 --- a/python/helpers/pydev/tests_python/test_tracing_on_top_level.py +++ b/python/helpers/pydev/pydev_tests_python/test_tracing_on_top_level.py @@ -1,6 +1,6 @@ from pydevd import PyDB import pytest -from tests_python.debugger_unittest import IS_CPYTHON +from pydev_tests_python.debugger_unittest import IS_CPYTHON DEBUG = False @@ -75,7 +75,7 @@ class _TraceTopLevel(object): def add_unhandled_exception_breakpoint(self): from _pydevd_bundle.pydevd_process_net_command import process_net_command - from tests_python.debugger_unittest import CMD_ADD_EXCEPTION_BREAK + from pydev_tests_python.debugger_unittest import CMD_ADD_EXCEPTION_BREAK for exc_name in ('AssertionError', 'RuntimeError'): process_net_command( self.py_db, diff --git a/python/helpers/pydev/tests_python/tests_single_notification.py b/python/helpers/pydev/pydev_tests_python/tests_single_notification.py similarity index 99% rename from python/helpers/pydev/tests_python/tests_single_notification.py rename to python/helpers/pydev/pydev_tests_python/tests_single_notification.py index c1946fbc7a37..8dc379d48878 100644 --- a/python/helpers/pydev/tests_python/tests_single_notification.py +++ b/python/helpers/pydev/pydev_tests_python/tests_single_notification.py @@ -6,7 +6,7 @@ import time import pytest from _pydevd_bundle.pydevd_comm import run_as_pydevd_daemon_thread -from tests_python.debugger_unittest import CMD_THREAD_SUSPEND, CMD_STEP_OVER, CMD_SET_BREAK +from pydev_tests_python.debugger_unittest import CMD_THREAD_SUSPEND, CMD_STEP_OVER, CMD_SET_BREAK from _pydev_bundle.pydev_override import overrides STATE_RUN = 1 diff --git a/python/helpers/pydev/tests_runfiles/not_in_default_pythonpath.txt b/python/helpers/pydev/pydev_tests_runfiles/not_in_default_pythonpath.txt similarity index 100% rename from python/helpers/pydev/tests_runfiles/not_in_default_pythonpath.txt rename to python/helpers/pydev/pydev_tests_runfiles/not_in_default_pythonpath.txt diff --git a/python/helpers/pydev/tests_runfiles/samples/.cvsignore b/python/helpers/pydev/pydev_tests_runfiles/samples/.cvsignore similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/.cvsignore rename to python/helpers/pydev/pydev_tests_runfiles/samples/.cvsignore diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/.cvsignore b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/.cvsignore similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/.cvsignore rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/.cvsignore diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/__init__.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/__init__.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/__init__.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/__init__.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/.cvsignore b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/.cvsignore similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/.cvsignore rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/.cvsignore diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/__init__.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/__init__.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/__init__.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/__init__.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/deep_nest_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/non_test_file.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/non_test_file.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested2/non_test_file.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested2/non_test_file.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/.cvsignore b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/.cvsignore similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/.cvsignore rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/.cvsignore diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/__init__.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/__init__.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/__init__.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/__init__.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/junk.txt b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/junk.txt similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/junk.txt rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/junk.txt diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/non_test_file.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/non_test_file.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/nested3/non_test_file.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/nested3/non_test_file.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/non_test_file.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/non_test_file.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/non_test_file.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/non_test_file.py diff --git a/python/helpers/pydev/tests_runfiles/samples/nested_dir/simple4_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/simple4_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/nested_dir/simple4_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/nested_dir/simple4_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/non_test_file.py b/python/helpers/pydev/pydev_tests_runfiles/samples/non_test_file.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/non_test_file.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/non_test_file.py diff --git a/python/helpers/pydev/tests_runfiles/samples/not_in_default_pythonpath.txt b/python/helpers/pydev/pydev_tests_runfiles/samples/not_in_default_pythonpath.txt similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/not_in_default_pythonpath.txt rename to python/helpers/pydev/pydev_tests_runfiles/samples/not_in_default_pythonpath.txt diff --git a/python/helpers/pydev/tests_runfiles/samples/simple2_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/simple2_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/simple2_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/simple2_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/simple3_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/simple3_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/simple3_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/simple3_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/simpleClass_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/simpleClass_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/simpleClass_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/simpleClass_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/simpleModule_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/simpleModule_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/simpleModule_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/simpleModule_test.py diff --git a/python/helpers/pydev/tests_runfiles/samples/simple_test.py b/python/helpers/pydev/pydev_tests_runfiles/samples/simple_test.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/samples/simple_test.py rename to python/helpers/pydev/pydev_tests_runfiles/samples/simple_test.py diff --git a/python/helpers/pydev/tests_runfiles/test_pydevd_property.py b/python/helpers/pydev/pydev_tests_runfiles/test_pydevd_property.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/test_pydevd_property.py rename to python/helpers/pydev/pydev_tests_runfiles/test_pydevd_property.py diff --git a/python/helpers/pydev/tests_runfiles/test_pydevdio.py b/python/helpers/pydev/pydev_tests_runfiles/test_pydevdio.py similarity index 100% rename from python/helpers/pydev/tests_runfiles/test_pydevdio.py rename to python/helpers/pydev/pydev_tests_runfiles/test_pydevdio.py diff --git a/python/helpers/pydev/tests_runfiles/test_runfiles.py b/python/helpers/pydev/pydev_tests_runfiles/test_runfiles.py similarity index 99% rename from python/helpers/pydev/tests_runfiles/test_runfiles.py rename to python/helpers/pydev/pydev_tests_runfiles/test_runfiles.py index b2c0e938cd1f..d8da5adeb373 100644 --- a/python/helpers/pydev/tests_runfiles/test_runfiles.py +++ b/python/helpers/pydev/pydev_tests_runfiles/test_runfiles.py @@ -1,6 +1,6 @@ import os.path import sys -from tests_python.test_debugger import IS_PY26 +from pydev_tests_python.test_debugger import IS_PY26 IS_JYTHON = sys.platform.find('java') != -1 diff --git a/python/helpers/pydev/pytest.ini b/python/helpers/pydev/pytest.ini index cd47002bb353..c7795b928dc9 100644 --- a/python/helpers/pydev/pytest.ini +++ b/python/helpers/pydev/pytest.ini @@ -1,4 +1,4 @@ [pytest] norecursedirs=tests_runfiles/samples addopts=-vv -testpaths=test_pydevd_reload tests tests_mainloop tests_python tests_runfiles \ No newline at end of file +testpaths=pydev_test_pydevd_reload pydev_tests pydev_tests_mainloop pydev_tests_python pydev_tests_runfiles \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/python/debug/PythonDebuggerTest.java b/python/testSrc/com/jetbrains/env/python/debug/PythonDebuggerTest.java index e8fbeb05df41..2ef1a09b6812 100644 --- a/python/testSrc/com/jetbrains/env/python/debug/PythonDebuggerTest.java +++ b/python/testSrc/com/jetbrains/env/python/debug/PythonDebuggerTest.java @@ -81,22 +81,22 @@ public class PythonDebuggerTest extends PyEnvTestCase { @Test public void testPydevTests_Debugger() { - pytests("tests_python/test_debugger.py", Sets.newHashSet("pytest", "-iron", "untangle")); + pytests("pydev_tests_python/test_debugger.py", Sets.newHashSet("pytest", "-iron", "untangle")); } @Test public void testPydevMonkey() { - unittests("tests_python/test_pydev_monkey.py", null); + unittests("pydev_tests_python/test_pydev_monkey.py", null); } @Test public void testBytecodeModification() { - unittests("tests_python/test_bytecode_modification.py", Sets.newHashSet("python3.6", "pytest")); + unittests("pydev_tests_python/test_bytecode_modification.py", Sets.newHashSet("python3.6", "pytest")); } @Test public void testFrameEvalAndTracing() { - pytests("tests_python/test_frame_eval_and_tracing.py", Sets.newHashSet("pytest", "-iron")); + pytests("pydev_tests_python/test_frame_eval_and_tracing.py", Sets.newHashSet("pytest", "-iron")); } private void pytests(final String script, @Nullable Set tags) {