Move get_test_dirs to a separate file

This commit is contained in:
Ayaz Salikhov
2025-02-23 20:57:41 +00:00
parent 27dfcdb326
commit 24fe890c21
4 changed files with 24 additions and 20 deletions

View File

@@ -0,0 +1,21 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from pathlib import Path
from tests.hierarchy.images_hierarchy import IMAGE_PARENT
THIS_DIR = Path(__file__).parent.resolve()
IMAGE_SPECIFIC_TESTS_DIR = THIS_DIR.parent / "image_specific_tests"
assert IMAGE_SPECIFIC_TESTS_DIR.exists(), f"{IMAGE_SPECIFIC_TESTS_DIR} does not exist."
def get_test_dirs(image: str | None) -> list[Path]:
if image is None:
return []
test_dirs = get_test_dirs(IMAGE_PARENT[image])
current_test_dir = IMAGE_SPECIFIC_TESTS_DIR / image
assert current_test_dir.exists(), f"{current_test_dir} does not exist."
test_dirs.append(current_test_dir)
return test_dirs

View File

@@ -1,15 +1,9 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
from pathlib import Path
THIS_DIR = Path(__file__).parent.resolve()
IMAGE_SPECIFIC_TESTS_DIR = THIS_DIR.parent / "image_specific_tests"
assert IMAGE_SPECIFIC_TESTS_DIR.exists(), f"{IMAGE_SPECIFIC_TESTS_DIR} does not exist."
# Please, take a look at the hierarchy of the images here:
# https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html#image-relationships
_IMAGE_PARENT = {
IMAGE_PARENT = {
"docker-stacks-foundation": None,
"base-notebook": "docker-stacks-foundation",
"minimal-notebook": "base-notebook",
@@ -22,14 +16,3 @@ _IMAGE_PARENT = {
"pyspark-notebook": "scipy-notebook",
"all-spark-notebook": "pyspark-notebook",
}
def get_test_dirs(image: str | None) -> list[Path]:
if image is None:
return []
test_dirs = get_test_dirs(_IMAGE_PARENT[image])
current_test_dir = IMAGE_SPECIFIC_TESTS_DIR / image
assert current_test_dir.exists(), f"{current_test_dir} does not exist."
test_dirs.append(current_test_dir)
return test_dirs

View File

@@ -2,7 +2,7 @@
# Distributed under the terms of the Modified BSD License.
import logging
from tests.hierarchy.images_hierarchy import get_test_dirs
from tests.hierarchy.get_test_dirs import get_test_dirs
from tests.utils.tracked_container import TrackedContainer
LOGGER = logging.getLogger(__name__)

View File

@@ -6,7 +6,7 @@ import logging
import plumbum
from tests.hierarchy.images_hierarchy import get_test_dirs
from tests.hierarchy.get_test_dirs import get_test_dirs
python3 = plumbum.local["python3"]