From dd050ba07cc9140611268d775e9671e3e3b5e136 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 22:52:59 +0200 Subject: [PATCH 1/6] gh-93839: Move Lib/ctypes/test/ to Lib/test/test_ctypes/ * Remove Lib/test/test_ctypes.py --- Lib/test/test_ctypes.py | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Lib/test/test_ctypes.py diff --git a/Lib/test/test_ctypes.py b/Lib/test/test_ctypes.py deleted file mode 100644 index b0a12c97347490..00000000000000 --- a/Lib/test/test_ctypes.py +++ /dev/null @@ -1,10 +0,0 @@ -import unittest -from test.support.import_helper import import_module - - -ctypes_test = import_module('ctypes.test') - -load_tests = ctypes_test.load_tests - -if __name__ == "__main__": - unittest.main() From 1ecf9b344a64c65a2fd8c625125ec234eef2e503 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 22:54:58 +0200 Subject: [PATCH 2/6] Move Lib/ctypes/test/ to Lib/test/test_ctypes/ --- Lib/{ctypes/test => test/test_ctypes}/__init__.py | 0 Lib/{ctypes/test => test/test_ctypes}/__main__.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_anon.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_array_in_pointer.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_arrays.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_as_parameter.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_bitfields.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_buffers.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_bytes.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_byteswap.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_callbacks.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_cast.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_cfuncs.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_checkretval.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_delattr.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_errno.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_find.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_frombuffer.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_funcptr.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_functions.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_incomplete.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_init.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_internals.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_keeprefs.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_libc.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_loading.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_macholib.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_memfunctions.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_numbers.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_objects.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_parameters.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_pep3118.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_pickling.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_pointers.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_prototypes.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_python_api.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_random_things.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_refcounts.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_repr.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_returnfuncptrs.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_simplesubclasses.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_sizes.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_slicing.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_stringptr.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_strings.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_struct_fields.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_structures.py | 0 .../test => test/test_ctypes}/test_unaligned_structures.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_unicode.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_values.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_varsize_struct.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_win32.py | 0 Lib/{ctypes/test => test/test_ctypes}/test_wintypes.py | 0 53 files changed, 0 insertions(+), 0 deletions(-) rename Lib/{ctypes/test => test/test_ctypes}/__init__.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/__main__.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_anon.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_array_in_pointer.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_arrays.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_as_parameter.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_bitfields.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_buffers.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_bytes.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_byteswap.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_callbacks.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_cast.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_cfuncs.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_checkretval.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_delattr.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_errno.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_find.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_frombuffer.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_funcptr.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_functions.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_incomplete.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_init.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_internals.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_keeprefs.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_libc.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_loading.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_macholib.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_memfunctions.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_numbers.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_objects.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_parameters.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_pep3118.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_pickling.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_pointers.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_prototypes.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_python_api.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_random_things.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_refcounts.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_repr.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_returnfuncptrs.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_simplesubclasses.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_sizes.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_slicing.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_stringptr.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_strings.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_struct_fields.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_structures.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_unaligned_structures.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_unicode.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_values.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_varsize_struct.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_win32.py (100%) rename Lib/{ctypes/test => test/test_ctypes}/test_wintypes.py (100%) diff --git a/Lib/ctypes/test/__init__.py b/Lib/test/test_ctypes/__init__.py similarity index 100% rename from Lib/ctypes/test/__init__.py rename to Lib/test/test_ctypes/__init__.py diff --git a/Lib/ctypes/test/__main__.py b/Lib/test/test_ctypes/__main__.py similarity index 100% rename from Lib/ctypes/test/__main__.py rename to Lib/test/test_ctypes/__main__.py diff --git a/Lib/ctypes/test/test_anon.py b/Lib/test/test_ctypes/test_anon.py similarity index 100% rename from Lib/ctypes/test/test_anon.py rename to Lib/test/test_ctypes/test_anon.py diff --git a/Lib/ctypes/test/test_array_in_pointer.py b/Lib/test/test_ctypes/test_array_in_pointer.py similarity index 100% rename from Lib/ctypes/test/test_array_in_pointer.py rename to Lib/test/test_ctypes/test_array_in_pointer.py diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/test/test_ctypes/test_arrays.py similarity index 100% rename from Lib/ctypes/test/test_arrays.py rename to Lib/test/test_ctypes/test_arrays.py diff --git a/Lib/ctypes/test/test_as_parameter.py b/Lib/test/test_ctypes/test_as_parameter.py similarity index 100% rename from Lib/ctypes/test/test_as_parameter.py rename to Lib/test/test_ctypes/test_as_parameter.py diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/test/test_ctypes/test_bitfields.py similarity index 100% rename from Lib/ctypes/test/test_bitfields.py rename to Lib/test/test_ctypes/test_bitfields.py diff --git a/Lib/ctypes/test/test_buffers.py b/Lib/test/test_ctypes/test_buffers.py similarity index 100% rename from Lib/ctypes/test/test_buffers.py rename to Lib/test/test_ctypes/test_buffers.py diff --git a/Lib/ctypes/test/test_bytes.py b/Lib/test/test_ctypes/test_bytes.py similarity index 100% rename from Lib/ctypes/test/test_bytes.py rename to Lib/test/test_ctypes/test_bytes.py diff --git a/Lib/ctypes/test/test_byteswap.py b/Lib/test/test_ctypes/test_byteswap.py similarity index 100% rename from Lib/ctypes/test/test_byteswap.py rename to Lib/test/test_ctypes/test_byteswap.py diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/test/test_ctypes/test_callbacks.py similarity index 100% rename from Lib/ctypes/test/test_callbacks.py rename to Lib/test/test_ctypes/test_callbacks.py diff --git a/Lib/ctypes/test/test_cast.py b/Lib/test/test_ctypes/test_cast.py similarity index 100% rename from Lib/ctypes/test/test_cast.py rename to Lib/test/test_ctypes/test_cast.py diff --git a/Lib/ctypes/test/test_cfuncs.py b/Lib/test/test_ctypes/test_cfuncs.py similarity index 100% rename from Lib/ctypes/test/test_cfuncs.py rename to Lib/test/test_ctypes/test_cfuncs.py diff --git a/Lib/ctypes/test/test_checkretval.py b/Lib/test/test_ctypes/test_checkretval.py similarity index 100% rename from Lib/ctypes/test/test_checkretval.py rename to Lib/test/test_ctypes/test_checkretval.py diff --git a/Lib/ctypes/test/test_delattr.py b/Lib/test/test_ctypes/test_delattr.py similarity index 100% rename from Lib/ctypes/test/test_delattr.py rename to Lib/test/test_ctypes/test_delattr.py diff --git a/Lib/ctypes/test/test_errno.py b/Lib/test/test_ctypes/test_errno.py similarity index 100% rename from Lib/ctypes/test/test_errno.py rename to Lib/test/test_ctypes/test_errno.py diff --git a/Lib/ctypes/test/test_find.py b/Lib/test/test_ctypes/test_find.py similarity index 100% rename from Lib/ctypes/test/test_find.py rename to Lib/test/test_ctypes/test_find.py diff --git a/Lib/ctypes/test/test_frombuffer.py b/Lib/test/test_ctypes/test_frombuffer.py similarity index 100% rename from Lib/ctypes/test/test_frombuffer.py rename to Lib/test/test_ctypes/test_frombuffer.py diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/test/test_ctypes/test_funcptr.py similarity index 100% rename from Lib/ctypes/test/test_funcptr.py rename to Lib/test/test_ctypes/test_funcptr.py diff --git a/Lib/ctypes/test/test_functions.py b/Lib/test/test_ctypes/test_functions.py similarity index 100% rename from Lib/ctypes/test/test_functions.py rename to Lib/test/test_ctypes/test_functions.py diff --git a/Lib/ctypes/test/test_incomplete.py b/Lib/test/test_ctypes/test_incomplete.py similarity index 100% rename from Lib/ctypes/test/test_incomplete.py rename to Lib/test/test_ctypes/test_incomplete.py diff --git a/Lib/ctypes/test/test_init.py b/Lib/test/test_ctypes/test_init.py similarity index 100% rename from Lib/ctypes/test/test_init.py rename to Lib/test/test_ctypes/test_init.py diff --git a/Lib/ctypes/test/test_internals.py b/Lib/test/test_ctypes/test_internals.py similarity index 100% rename from Lib/ctypes/test/test_internals.py rename to Lib/test/test_ctypes/test_internals.py diff --git a/Lib/ctypes/test/test_keeprefs.py b/Lib/test/test_ctypes/test_keeprefs.py similarity index 100% rename from Lib/ctypes/test/test_keeprefs.py rename to Lib/test/test_ctypes/test_keeprefs.py diff --git a/Lib/ctypes/test/test_libc.py b/Lib/test/test_ctypes/test_libc.py similarity index 100% rename from Lib/ctypes/test/test_libc.py rename to Lib/test/test_ctypes/test_libc.py diff --git a/Lib/ctypes/test/test_loading.py b/Lib/test/test_ctypes/test_loading.py similarity index 100% rename from Lib/ctypes/test/test_loading.py rename to Lib/test/test_ctypes/test_loading.py diff --git a/Lib/ctypes/test/test_macholib.py b/Lib/test/test_ctypes/test_macholib.py similarity index 100% rename from Lib/ctypes/test/test_macholib.py rename to Lib/test/test_ctypes/test_macholib.py diff --git a/Lib/ctypes/test/test_memfunctions.py b/Lib/test/test_ctypes/test_memfunctions.py similarity index 100% rename from Lib/ctypes/test/test_memfunctions.py rename to Lib/test/test_ctypes/test_memfunctions.py diff --git a/Lib/ctypes/test/test_numbers.py b/Lib/test/test_ctypes/test_numbers.py similarity index 100% rename from Lib/ctypes/test/test_numbers.py rename to Lib/test/test_ctypes/test_numbers.py diff --git a/Lib/ctypes/test/test_objects.py b/Lib/test/test_ctypes/test_objects.py similarity index 100% rename from Lib/ctypes/test/test_objects.py rename to Lib/test/test_ctypes/test_objects.py diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/test/test_ctypes/test_parameters.py similarity index 100% rename from Lib/ctypes/test/test_parameters.py rename to Lib/test/test_ctypes/test_parameters.py diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/test/test_ctypes/test_pep3118.py similarity index 100% rename from Lib/ctypes/test/test_pep3118.py rename to Lib/test/test_ctypes/test_pep3118.py diff --git a/Lib/ctypes/test/test_pickling.py b/Lib/test/test_ctypes/test_pickling.py similarity index 100% rename from Lib/ctypes/test/test_pickling.py rename to Lib/test/test_ctypes/test_pickling.py diff --git a/Lib/ctypes/test/test_pointers.py b/Lib/test/test_ctypes/test_pointers.py similarity index 100% rename from Lib/ctypes/test/test_pointers.py rename to Lib/test/test_ctypes/test_pointers.py diff --git a/Lib/ctypes/test/test_prototypes.py b/Lib/test/test_ctypes/test_prototypes.py similarity index 100% rename from Lib/ctypes/test/test_prototypes.py rename to Lib/test/test_ctypes/test_prototypes.py diff --git a/Lib/ctypes/test/test_python_api.py b/Lib/test/test_ctypes/test_python_api.py similarity index 100% rename from Lib/ctypes/test/test_python_api.py rename to Lib/test/test_ctypes/test_python_api.py diff --git a/Lib/ctypes/test/test_random_things.py b/Lib/test/test_ctypes/test_random_things.py similarity index 100% rename from Lib/ctypes/test/test_random_things.py rename to Lib/test/test_ctypes/test_random_things.py diff --git a/Lib/ctypes/test/test_refcounts.py b/Lib/test/test_ctypes/test_refcounts.py similarity index 100% rename from Lib/ctypes/test/test_refcounts.py rename to Lib/test/test_ctypes/test_refcounts.py diff --git a/Lib/ctypes/test/test_repr.py b/Lib/test/test_ctypes/test_repr.py similarity index 100% rename from Lib/ctypes/test/test_repr.py rename to Lib/test/test_ctypes/test_repr.py diff --git a/Lib/ctypes/test/test_returnfuncptrs.py b/Lib/test/test_ctypes/test_returnfuncptrs.py similarity index 100% rename from Lib/ctypes/test/test_returnfuncptrs.py rename to Lib/test/test_ctypes/test_returnfuncptrs.py diff --git a/Lib/ctypes/test/test_simplesubclasses.py b/Lib/test/test_ctypes/test_simplesubclasses.py similarity index 100% rename from Lib/ctypes/test/test_simplesubclasses.py rename to Lib/test/test_ctypes/test_simplesubclasses.py diff --git a/Lib/ctypes/test/test_sizes.py b/Lib/test/test_ctypes/test_sizes.py similarity index 100% rename from Lib/ctypes/test/test_sizes.py rename to Lib/test/test_ctypes/test_sizes.py diff --git a/Lib/ctypes/test/test_slicing.py b/Lib/test/test_ctypes/test_slicing.py similarity index 100% rename from Lib/ctypes/test/test_slicing.py rename to Lib/test/test_ctypes/test_slicing.py diff --git a/Lib/ctypes/test/test_stringptr.py b/Lib/test/test_ctypes/test_stringptr.py similarity index 100% rename from Lib/ctypes/test/test_stringptr.py rename to Lib/test/test_ctypes/test_stringptr.py diff --git a/Lib/ctypes/test/test_strings.py b/Lib/test/test_ctypes/test_strings.py similarity index 100% rename from Lib/ctypes/test/test_strings.py rename to Lib/test/test_ctypes/test_strings.py diff --git a/Lib/ctypes/test/test_struct_fields.py b/Lib/test/test_ctypes/test_struct_fields.py similarity index 100% rename from Lib/ctypes/test/test_struct_fields.py rename to Lib/test/test_ctypes/test_struct_fields.py diff --git a/Lib/ctypes/test/test_structures.py b/Lib/test/test_ctypes/test_structures.py similarity index 100% rename from Lib/ctypes/test/test_structures.py rename to Lib/test/test_ctypes/test_structures.py diff --git a/Lib/ctypes/test/test_unaligned_structures.py b/Lib/test/test_ctypes/test_unaligned_structures.py similarity index 100% rename from Lib/ctypes/test/test_unaligned_structures.py rename to Lib/test/test_ctypes/test_unaligned_structures.py diff --git a/Lib/ctypes/test/test_unicode.py b/Lib/test/test_ctypes/test_unicode.py similarity index 100% rename from Lib/ctypes/test/test_unicode.py rename to Lib/test/test_ctypes/test_unicode.py diff --git a/Lib/ctypes/test/test_values.py b/Lib/test/test_ctypes/test_values.py similarity index 100% rename from Lib/ctypes/test/test_values.py rename to Lib/test/test_ctypes/test_values.py diff --git a/Lib/ctypes/test/test_varsize_struct.py b/Lib/test/test_ctypes/test_varsize_struct.py similarity index 100% rename from Lib/ctypes/test/test_varsize_struct.py rename to Lib/test/test_ctypes/test_varsize_struct.py diff --git a/Lib/ctypes/test/test_win32.py b/Lib/test/test_ctypes/test_win32.py similarity index 100% rename from Lib/ctypes/test/test_win32.py rename to Lib/test/test_ctypes/test_win32.py diff --git a/Lib/ctypes/test/test_wintypes.py b/Lib/test/test_ctypes/test_wintypes.py similarity index 100% rename from Lib/ctypes/test/test_wintypes.py rename to Lib/test/test_ctypes/test_wintypes.py From 8f9aa7f55172f553ac0182536d320f2a26e95c3e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 22:55:02 +0200 Subject: [PATCH 3/6] Update imports --- Lib/test/test_ctypes/test_arrays.py | 2 +- Lib/test/test_ctypes/test_as_parameter.py | 2 +- Lib/test/test_ctypes/test_bitfields.py | 2 +- Lib/test/test_ctypes/test_buffers.py | 2 +- Lib/test/test_ctypes/test_callbacks.py | 2 +- Lib/test/test_ctypes/test_cast.py | 2 +- Lib/test/test_ctypes/test_cfuncs.py | 2 +- Lib/test/test_ctypes/test_checkretval.py | 2 +- Lib/test/test_ctypes/test_functions.py | 2 +- Lib/test/test_ctypes/test_memfunctions.py | 2 +- Lib/test/test_ctypes/test_parameters.py | 2 +- Lib/test/test_ctypes/test_prototypes.py | 2 +- Lib/test/test_ctypes/test_slicing.py | 2 +- Lib/test/test_ctypes/test_strings.py | 2 +- Lib/test/test_ctypes/test_structures.py | 2 +- Lib/test/test_ctypes/test_unicode.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_ctypes/test_arrays.py b/Lib/test/test_ctypes/test_arrays.py index 14603b7049c92c..415a5785a9c1bb 100644 --- a/Lib/test/test_ctypes/test_arrays.py +++ b/Lib/test/test_ctypes/test_arrays.py @@ -3,7 +3,7 @@ import sys from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol formats = "bBhHiIlLqQfd" diff --git a/Lib/test/test_ctypes/test_as_parameter.py b/Lib/test/test_ctypes/test_as_parameter.py index f9d27cb89d341b..b35defb15851a0 100644 --- a/Lib/test/test_ctypes/test_as_parameter.py +++ b/Lib/test/test_ctypes/test_as_parameter.py @@ -1,6 +1,6 @@ import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import _ctypes_test dll = CDLL(_ctypes_test.__file__) diff --git a/Lib/test/test_ctypes/test_bitfields.py b/Lib/test/test_ctypes/test_bitfields.py index 66acd62e6851a1..dad71a0ba7ee4a 100644 --- a/Lib/test/test_ctypes/test_bitfields.py +++ b/Lib/test/test_ctypes/test_bitfields.py @@ -1,5 +1,5 @@ from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol from test import support import unittest import os diff --git a/Lib/test/test_ctypes/test_buffers.py b/Lib/test/test_ctypes/test_buffers.py index 15782be757c853..a9be2023aa0fa0 100644 --- a/Lib/test/test_ctypes/test_buffers.py +++ b/Lib/test/test_ctypes/test_buffers.py @@ -1,5 +1,5 @@ from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import unittest class StringBufferTestCase(unittest.TestCase): diff --git a/Lib/test/test_ctypes/test_callbacks.py b/Lib/test/test_ctypes/test_callbacks.py index 1099cf9a69c6b1..2758720d4a9543 100644 --- a/Lib/test/test_ctypes/test_callbacks.py +++ b/Lib/test/test_ctypes/test_callbacks.py @@ -3,7 +3,7 @@ from test import support from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol from _ctypes import CTYPES_MAX_ARGCOUNT import _ctypes_test diff --git a/Lib/test/test_ctypes/test_cast.py b/Lib/test/test_ctypes/test_cast.py index 6878f9732826f1..7ee23b16f1b00b 100644 --- a/Lib/test/test_ctypes/test_cast.py +++ b/Lib/test/test_ctypes/test_cast.py @@ -1,5 +1,5 @@ from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import unittest import sys diff --git a/Lib/test/test_ctypes/test_cfuncs.py b/Lib/test/test_ctypes/test_cfuncs.py index ac2240fa197d3f..0a9394bf31359f 100644 --- a/Lib/test/test_ctypes/test_cfuncs.py +++ b/Lib/test/test_ctypes/test_cfuncs.py @@ -3,7 +3,7 @@ import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import _ctypes_test diff --git a/Lib/test/test_ctypes/test_checkretval.py b/Lib/test/test_ctypes/test_checkretval.py index e9567dc3912585..1492099f4b9e99 100644 --- a/Lib/test/test_ctypes/test_checkretval.py +++ b/Lib/test/test_ctypes/test_checkretval.py @@ -1,7 +1,7 @@ import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol class CHECKED(c_int): def _check_retval_(value): diff --git a/Lib/test/test_ctypes/test_functions.py b/Lib/test/test_ctypes/test_functions.py index f9e92e1cc6b068..4a784c8d798949 100644 --- a/Lib/test/test_ctypes/test_functions.py +++ b/Lib/test/test_ctypes/test_functions.py @@ -6,7 +6,7 @@ """ from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import sys, unittest try: diff --git a/Lib/test/test_ctypes/test_memfunctions.py b/Lib/test/test_ctypes/test_memfunctions.py index e784b9a7068422..d5c973521177c8 100644 --- a/Lib/test/test_ctypes/test_memfunctions.py +++ b/Lib/test/test_ctypes/test_memfunctions.py @@ -2,7 +2,7 @@ from test import support import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol class MemFunctionsTest(unittest.TestCase): @unittest.skip('test disabled') diff --git a/Lib/test/test_ctypes/test_parameters.py b/Lib/test/test_ctypes/test_parameters.py index 38af7ac13d756c..2f755a6d09f904 100644 --- a/Lib/test/test_ctypes/test_parameters.py +++ b/Lib/test/test_ctypes/test_parameters.py @@ -1,5 +1,5 @@ import unittest -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import test.support class SimpleTypesTestCase(unittest.TestCase): diff --git a/Lib/test/test_ctypes/test_prototypes.py b/Lib/test/test_ctypes/test_prototypes.py index cd0c649de3e31b..bf27561487ac81 100644 --- a/Lib/test/test_ctypes/test_prototypes.py +++ b/Lib/test/test_ctypes/test_prototypes.py @@ -1,5 +1,5 @@ from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import unittest # IMPORTANT INFO: diff --git a/Lib/test/test_ctypes/test_slicing.py b/Lib/test/test_ctypes/test_slicing.py index a3932f176728af..b3e68f9a822d94 100644 --- a/Lib/test/test_ctypes/test_slicing.py +++ b/Lib/test/test_ctypes/test_slicing.py @@ -1,6 +1,6 @@ import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import _ctypes_test diff --git a/Lib/test/test_ctypes/test_strings.py b/Lib/test/test_ctypes/test_strings.py index 12e208828a70db..a9003be3f506e2 100644 --- a/Lib/test/test_ctypes/test_strings.py +++ b/Lib/test/test_ctypes/test_strings.py @@ -1,6 +1,6 @@ import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol class StringArrayTestCase(unittest.TestCase): def test(self): diff --git a/Lib/test/test_ctypes/test_structures.py b/Lib/test/test_ctypes/test_structures.py index 97ad2b8ed8a50d..13c0470ba2238c 100644 --- a/Lib/test/test_ctypes/test_structures.py +++ b/Lib/test/test_ctypes/test_structures.py @@ -2,7 +2,7 @@ import sys import unittest from ctypes import * -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol from struct import calcsize import _ctypes_test from test import support diff --git a/Lib/test/test_ctypes/test_unicode.py b/Lib/test/test_ctypes/test_unicode.py index 60c75424b767fa..319cb3b1dcac21 100644 --- a/Lib/test/test_ctypes/test_unicode.py +++ b/Lib/test/test_ctypes/test_unicode.py @@ -1,6 +1,6 @@ import unittest import ctypes -from ctypes.test import need_symbol +from test.test_ctypes import need_symbol import _ctypes_test From a1ea2207b309750ee0cc155c9da9347b1fee4454 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 22:56:08 +0200 Subject: [PATCH 4/6] Update test_objects --- Lib/test/test_ctypes/test_objects.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_ctypes/test_objects.py b/Lib/test/test_ctypes/test_objects.py index 19e3dc1f2d7621..44a3c61ad79267 100644 --- a/Lib/test/test_ctypes/test_objects.py +++ b/Lib/test/test_ctypes/test_objects.py @@ -42,7 +42,7 @@ of 'x' ('_b_base_' is either None, or the root object owning the memory block): >>> print(x.array._b_base_) # doctest: +ELLIPSIS - + >>> >>> x.array[0] = b'spam spam spam' @@ -56,12 +56,12 @@ import unittest, doctest -import ctypes.test.test_objects +import test.test_ctypes.test_objects class TestCase(unittest.TestCase): def test(self): - failures, tests = doctest.testmod(ctypes.test.test_objects) + failures, tests = doctest.testmod(test.test_ctypes.test_objects) self.assertFalse(failures, 'doctests failed, see output above') if __name__ == '__main__': - doctest.testmod(ctypes.test.test_objects) + doctest.testmod(test.test_ctypes.test_objects) From ec570f8e0d7689db411921c63b667f5f2da430d9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 23:03:34 +0200 Subject: [PATCH 5/6] Update build system --- Lib/test/leakers/test_ctypes.py | 2 +- Lib/test/test_ctypes/__main__.py | 2 +- Makefile.pre.in | 4 +- PCbuild/lib.pyproj | 109 +++++++++++++++---------------- Tools/wasm/wasm_assets.py | 1 - 5 files changed, 58 insertions(+), 60 deletions(-) diff --git a/Lib/test/leakers/test_ctypes.py b/Lib/test/leakers/test_ctypes.py index 7d7e9ff3a11129..ec09ac36996b0c 100644 --- a/Lib/test/leakers/test_ctypes.py +++ b/Lib/test/leakers/test_ctypes.py @@ -1,5 +1,5 @@ -# Taken from Lib/ctypes/test/test_keeprefs.py, PointerToStructure.test(). +# Taken from Lib/test/test_ctypes/test_keeprefs.py, PointerToStructure.test(). from ctypes import Structure, c_int, POINTER import gc diff --git a/Lib/test/test_ctypes/__main__.py b/Lib/test/test_ctypes/__main__.py index 362a9ec8cff6c0..3003d4db890d4d 100644 --- a/Lib/test/test_ctypes/__main__.py +++ b/Lib/test/test_ctypes/__main__.py @@ -1,4 +1,4 @@ -from ctypes.test import load_tests +from test.test_ctypes import load_tests import unittest unittest.main() diff --git a/Makefile.pre.in b/Makefile.pre.in index eaaab5e0118f19..4b8a67f3cfa3a9 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1918,8 +1918,7 @@ LIBSUBDIRS= asyncio \ xmlrpc \ zoneinfo \ __phello__ -TESTSUBDIRS= ctypes/test \ - distutils/tests \ +TESTSUBDIRS= distutils/tests \ idlelib/idle_test \ lib2to3/tests \ lib2to3/tests/data \ @@ -1933,6 +1932,7 @@ TESTSUBDIRS= ctypes/test \ test/libregrtest test/sndhdrdata \ test/subprocessdata test/support \ test/test_asyncio \ + test/test_ctypes \ test/test_email test/test_email/data \ test/test_import \ test/test_import/data \ diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj index 43c570f1dab37a..692b083349da20 100644 --- a/PCbuild/lib.pyproj +++ b/PCbuild/lib.pyproj @@ -83,59 +83,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -944,7 +891,59 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1725,7 +1724,6 @@ - @@ -1769,6 +1767,7 @@ + diff --git a/Tools/wasm/wasm_assets.py b/Tools/wasm/wasm_assets.py index b7e83517cae036..d0a0570840be68 100755 --- a/Tools/wasm/wasm_assets.py +++ b/Tools/wasm/wasm_assets.py @@ -111,7 +111,6 @@ # regression test sub directories OMIT_SUBDIRS = ( - "ctypes/test/", "tkinter/test/", "unittest/test/", ) From 5838de3404b6e46918fdaffd87fa4bd94a8e2816 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2022 23:04:54 +0200 Subject: [PATCH 6/6] Add NEWS entry --- .../next/Tests/2022-06-20-23-04-52.gh-issue-93839.OE3Ybk.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Tests/2022-06-20-23-04-52.gh-issue-93839.OE3Ybk.rst diff --git a/Misc/NEWS.d/next/Tests/2022-06-20-23-04-52.gh-issue-93839.OE3Ybk.rst b/Misc/NEWS.d/next/Tests/2022-06-20-23-04-52.gh-issue-93839.OE3Ybk.rst new file mode 100644 index 00000000000000..121b64b13307ae --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-06-20-23-04-52.gh-issue-93839.OE3Ybk.rst @@ -0,0 +1,2 @@ +Move ``Lib/ctypes/test/`` to ``Lib/test/test_ctypes/``. Patch by Victor +Stinner. pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy