From bc5c413cd5942e59179e7512578565e50718d662 Mon Sep 17 00:00:00 2001 From: kunitoki Date: Thu, 28 May 2026 11:03:15 +0200 Subject: [PATCH] Fix python tests relative paths --- python/tests/__init__.py | 8 ++++++-- python/tests/conftest.py | 11 +++++++++-- python/tests/test_yup_core/__init__.py | 2 +- python/tests/test_yup_core/test_File.py | 2 +- python/tests/test_yup_core/test_FileFilter.py | 2 +- python/tests/test_yup_core/test_FileOutputStream.py | 2 +- python/tests/test_yup_core/test_JSON.py | 2 +- python/tests/test_yup_core/test_TemporaryFile.py | 2 +- python/tests/test_yup_core/test_XmlElement.py | 2 +- python/tests/test_yup_core/test_ZipFile.py | 2 +- python/tests/test_yup_events/__init__.py | 2 +- python/tests/test_yup_graphics/__init__.py | 2 +- python/tests/utilities.py | 2 +- 13 files changed, 26 insertions(+), 15 deletions(-) diff --git a/python/tests/__init__.py b/python/tests/__init__.py index 0fcb8cd78..ea8fff443 100644 --- a/python/tests/__init__.py +++ b/python/tests/__init__.py @@ -1,3 +1,7 @@ -from . import common +import sys +from pathlib import Path -import yup +tests_folder = str(Path(__file__).parent) + +if tests_folder not in sys.path: + sys.path.insert(0, tests_folder) diff --git a/python/tests/conftest.py b/python/tests/conftest.py index aa8c0a3e2..668bc2b05 100644 --- a/python/tests/conftest.py +++ b/python/tests/conftest.py @@ -1,8 +1,15 @@ import sys +from pathlib import Path + import pytest -from . import common -from .utilities import get_runtime_data_folder, remove_directory_recursively +tests_folder = str(Path(__file__).parent) + +if tests_folder not in sys.path: + sys.path.insert(0, tests_folder) + +import common +from utilities import get_runtime_data_folder, remove_directory_recursively import yup diff --git a/python/tests/test_yup_core/__init__.py b/python/tests/test_yup_core/__init__.py index 40af73387..641b47e6c 100644 --- a/python/tests/test_yup_core/__init__.py +++ b/python/tests/test_yup_core/__init__.py @@ -1 +1 @@ -from .. import common +import common diff --git a/python/tests/test_yup_core/test_File.py b/python/tests/test_yup_core/test_File.py index 697ca2863..e30b56844 100644 --- a/python/tests/test_yup_core/test_File.py +++ b/python/tests/test_yup_core/test_File.py @@ -2,7 +2,7 @@ import sys import pytest -from ..utilities import get_runtime_data_file +from utilities import get_runtime_data_file import yup this_file = os.path.abspath(__file__) diff --git a/python/tests/test_yup_core/test_FileFilter.py b/python/tests/test_yup_core/test_FileFilter.py index 6c3d74eaf..fc0d9a6bd 100644 --- a/python/tests/test_yup_core/test_FileFilter.py +++ b/python/tests/test_yup_core/test_FileFilter.py @@ -1,6 +1,6 @@ import os -from ..utilities import get_runtime_data_file +from utilities import get_runtime_data_file import yup this_file = os.path.abspath(__file__) diff --git a/python/tests/test_yup_core/test_FileOutputStream.py b/python/tests/test_yup_core/test_FileOutputStream.py index 2caf63231..066c2f1e2 100644 --- a/python/tests/test_yup_core/test_FileOutputStream.py +++ b/python/tests/test_yup_core/test_FileOutputStream.py @@ -2,7 +2,7 @@ import textwrap import pytest -from ..utilities import get_runtime_data_file +from utilities import get_runtime_data_file import yup diff --git a/python/tests/test_yup_core/test_JSON.py b/python/tests/test_yup_core/test_JSON.py index 9f1f322a9..60c086884 100644 --- a/python/tests/test_yup_core/test_JSON.py +++ b/python/tests/test_yup_core/test_JSON.py @@ -1,6 +1,6 @@ import pytest -from ..utilities import get_runtime_data_file +from utilities import get_runtime_data_file import yup #================================================================================================== diff --git a/python/tests/test_yup_core/test_TemporaryFile.py b/python/tests/test_yup_core/test_TemporaryFile.py index ef97efc1a..5e323f36f 100644 --- a/python/tests/test_yup_core/test_TemporaryFile.py +++ b/python/tests/test_yup_core/test_TemporaryFile.py @@ -1,7 +1,7 @@ import pytest import os -from ..utilities import get_runtime_data_file +from utilities import get_runtime_data_file import yup #================================================================================================== diff --git a/python/tests/test_yup_core/test_XmlElement.py b/python/tests/test_yup_core/test_XmlElement.py index b81c5531b..6de3d7037 100644 --- a/python/tests/test_yup_core/test_XmlElement.py +++ b/python/tests/test_yup_core/test_XmlElement.py @@ -2,7 +2,7 @@ import sys import pytest -from ..utilities import get_runtime_data_folder +from utilities import get_runtime_data_folder import yup diff --git a/python/tests/test_yup_core/test_ZipFile.py b/python/tests/test_yup_core/test_ZipFile.py index 5503fb65f..4ec46c8d1 100644 --- a/python/tests/test_yup_core/test_ZipFile.py +++ b/python/tests/test_yup_core/test_ZipFile.py @@ -4,7 +4,7 @@ import yup -from ..utilities import get_runtime_data_folder +from utilities import get_runtime_data_folder #================================================================================================== diff --git a/python/tests/test_yup_events/__init__.py b/python/tests/test_yup_events/__init__.py index 2c2f1f1d5..f4066ba72 100644 --- a/python/tests/test_yup_events/__init__.py +++ b/python/tests/test_yup_events/__init__.py @@ -1,7 +1,7 @@ import pytest import sys -from .. import common +import common import yup diff --git a/python/tests/test_yup_graphics/__init__.py b/python/tests/test_yup_graphics/__init__.py index 45f1bbb44..4c55b593d 100644 --- a/python/tests/test_yup_graphics/__init__.py +++ b/python/tests/test_yup_graphics/__init__.py @@ -1,6 +1,6 @@ import pytest -from .. import common +import common import yup diff --git a/python/tests/utilities.py b/python/tests/utilities.py index b60bb92b6..5d815103e 100644 --- a/python/tests/utilities.py +++ b/python/tests/utilities.py @@ -1,7 +1,7 @@ import os from pathlib import Path -from . import common +import common import yup