diff --git a/tests/image_specific_tests/all-spark-notebook/data/issue_1168.ipynb b/tests/by_image/all-spark-notebook/data/issue_1168.ipynb similarity index 100% rename from tests/image_specific_tests/all-spark-notebook/data/issue_1168.ipynb rename to tests/by_image/all-spark-notebook/data/issue_1168.ipynb diff --git a/tests/image_specific_tests/all-spark-notebook/data/local_pyspark.ipynb b/tests/by_image/all-spark-notebook/data/local_pyspark.ipynb similarity index 100% rename from tests/image_specific_tests/all-spark-notebook/data/local_pyspark.ipynb rename to tests/by_image/all-spark-notebook/data/local_pyspark.ipynb diff --git a/tests/image_specific_tests/all-spark-notebook/data/local_sparkR.ipynb b/tests/by_image/all-spark-notebook/data/local_sparkR.ipynb similarity index 100% rename from tests/image_specific_tests/all-spark-notebook/data/local_sparkR.ipynb rename to tests/by_image/all-spark-notebook/data/local_sparkR.ipynb diff --git a/tests/image_specific_tests/all-spark-notebook/data/local_sparklyr.ipynb b/tests/by_image/all-spark-notebook/data/local_sparklyr.ipynb similarity index 100% rename from tests/image_specific_tests/all-spark-notebook/data/local_sparklyr.ipynb rename to tests/by_image/all-spark-notebook/data/local_sparklyr.ipynb diff --git a/tests/image_specific_tests/all-spark-notebook/test_spark_notebooks.py b/tests/by_image/all-spark-notebook/test_spark_notebooks.py similarity index 100% rename from tests/image_specific_tests/all-spark-notebook/test_spark_notebooks.py rename to tests/by_image/all-spark-notebook/test_spark_notebooks.py diff --git a/tests/image_specific_tests/base-notebook/test_container_options.py b/tests/by_image/base-notebook/test_container_options.py similarity index 100% rename from tests/image_specific_tests/base-notebook/test_container_options.py rename to tests/by_image/base-notebook/test_container_options.py diff --git a/tests/image_specific_tests/base-notebook/test_healthcheck.py b/tests/by_image/base-notebook/test_healthcheck.py similarity index 100% rename from tests/image_specific_tests/base-notebook/test_healthcheck.py rename to tests/by_image/base-notebook/test_healthcheck.py diff --git a/tests/image_specific_tests/base-notebook/test_notebook.py b/tests/by_image/base-notebook/test_notebook.py similarity index 100% rename from tests/image_specific_tests/base-notebook/test_notebook.py rename to tests/by_image/base-notebook/test_notebook.py diff --git a/tests/image_specific_tests/base-notebook/test_pandoc.py b/tests/by_image/base-notebook/test_pandoc.py similarity index 100% rename from tests/image_specific_tests/base-notebook/test_pandoc.py rename to tests/by_image/base-notebook/test_pandoc.py diff --git a/tests/image_specific_tests/base-notebook/test_start_container.py b/tests/by_image/base-notebook/test_start_container.py similarity index 100% rename from tests/image_specific_tests/base-notebook/test_start_container.py rename to tests/by_image/base-notebook/test_start_container.py diff --git a/tests/image_specific_tests/datascience-notebook/test_julia_datascience.py b/tests/by_image/datascience-notebook/test_julia_datascience.py similarity index 100% rename from tests/image_specific_tests/datascience-notebook/test_julia_datascience.py rename to tests/by_image/datascience-notebook/test_julia_datascience.py diff --git a/tests/image_specific_tests/datascience-notebook/test_mimetypes.py b/tests/by_image/datascience-notebook/test_mimetypes.py similarity index 100% rename from tests/image_specific_tests/datascience-notebook/test_mimetypes.py rename to tests/by_image/datascience-notebook/test_mimetypes.py diff --git a/tests/image_specific_tests/datascience-notebook/test_pluto_datascience.py b/tests/by_image/datascience-notebook/test_pluto_datascience.py similarity index 100% rename from tests/image_specific_tests/datascience-notebook/test_pluto_datascience.py rename to tests/by_image/datascience-notebook/test_pluto_datascience.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/a.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/change/a.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/a.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/change/a.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/b.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/change/b.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/b.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/change/b.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/c.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/change/c.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/c.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/change/c.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/executable.py b/tests/by_image/docker-stacks-foundation/data/run-hooks/executables/executable.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/executable.py rename to tests/by_image/docker-stacks-foundation/data/run-hooks/executables/executable.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/non_executable.py b/tests/by_image/docker-stacks-foundation/data/run-hooks/executables/non_executable.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/non_executable.py rename to tests/by_image/docker-stacks-foundation/data/run-hooks/executables/non_executable.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/run-me.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/executables/run-me.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/run-me.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/executables/run-me.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/a.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/failures/a.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/a.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/failures/a.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/b.py b/tests/by_image/docker-stacks-foundation/data/run-hooks/failures/b.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/b.py rename to tests/by_image/docker-stacks-foundation/data/run-hooks/failures/b.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/c.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/failures/c.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/c.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/failures/c.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/d.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/failures/d.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/d.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/failures/d.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/a.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/unset/a.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/a.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/unset/a.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/b.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/unset/b.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/b.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/unset/b.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/c.sh b/tests/by_image/docker-stacks-foundation/data/run-hooks/unset/c.sh similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/c.sh rename to tests/by_image/docker-stacks-foundation/data/run-hooks/unset/c.sh diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_outdated.py b/tests/by_image/docker-stacks-foundation/test_outdated.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_outdated.py rename to tests/by_image/docker-stacks-foundation/test_outdated.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_package_managers.py b/tests/by_image/docker-stacks-foundation/test_package_managers.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_package_managers.py rename to tests/by_image/docker-stacks-foundation/test_package_managers.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_packages.py b/tests/by_image/docker-stacks-foundation/test_packages.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_packages.py rename to tests/by_image/docker-stacks-foundation/test_packages.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_python_version.py b/tests/by_image/docker-stacks-foundation/test_python_version.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_python_version.py rename to tests/by_image/docker-stacks-foundation/test_python_version.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py b/tests/by_image/docker-stacks-foundation/test_run_hooks.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py rename to tests/by_image/docker-stacks-foundation/test_run_hooks.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_units.py b/tests/by_image/docker-stacks-foundation/test_units.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_units.py rename to tests/by_image/docker-stacks-foundation/test_units.py diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_user_options.py b/tests/by_image/docker-stacks-foundation/test_user_options.py similarity index 100% rename from tests/image_specific_tests/docker-stacks-foundation/test_user_options.py rename to tests/by_image/docker-stacks-foundation/test_user_options.py diff --git a/tests/image_specific_tests/julia-notebook/test_julia.py b/tests/by_image/julia-notebook/test_julia.py similarity index 100% rename from tests/image_specific_tests/julia-notebook/test_julia.py rename to tests/by_image/julia-notebook/test_julia.py diff --git a/tests/image_specific_tests/julia-notebook/test_pluto.py b/tests/by_image/julia-notebook/test_pluto.py similarity index 100% rename from tests/image_specific_tests/julia-notebook/test_pluto.py rename to tests/by_image/julia-notebook/test_pluto.py diff --git a/tests/image_specific_tests/minimal-notebook/data/Jupyter_logo.svg b/tests/by_image/minimal-notebook/data/Jupyter_logo.svg similarity index 100% rename from tests/image_specific_tests/minimal-notebook/data/Jupyter_logo.svg rename to tests/by_image/minimal-notebook/data/Jupyter_logo.svg diff --git a/tests/image_specific_tests/minimal-notebook/data/notebook_math.ipynb b/tests/by_image/minimal-notebook/data/notebook_math.ipynb similarity index 100% rename from tests/image_specific_tests/minimal-notebook/data/notebook_math.ipynb rename to tests/by_image/minimal-notebook/data/notebook_math.ipynb diff --git a/tests/image_specific_tests/minimal-notebook/data/notebook_svg.ipynb b/tests/by_image/minimal-notebook/data/notebook_svg.ipynb similarity index 100% rename from tests/image_specific_tests/minimal-notebook/data/notebook_svg.ipynb rename to tests/by_image/minimal-notebook/data/notebook_svg.ipynb diff --git a/tests/image_specific_tests/minimal-notebook/test_nbconvert.py b/tests/by_image/minimal-notebook/test_nbconvert.py similarity index 100% rename from tests/image_specific_tests/minimal-notebook/test_nbconvert.py rename to tests/by_image/minimal-notebook/test_nbconvert.py diff --git a/tests/image_specific_tests/pyspark-notebook/test_spark.py b/tests/by_image/pyspark-notebook/test_spark.py similarity index 100% rename from tests/image_specific_tests/pyspark-notebook/test_spark.py rename to tests/by_image/pyspark-notebook/test_spark.py diff --git a/tests/image_specific_tests/pyspark-notebook/units/unit_pandas_version.py b/tests/by_image/pyspark-notebook/units/unit_pandas_version.py similarity index 100% rename from tests/image_specific_tests/pyspark-notebook/units/unit_pandas_version.py rename to tests/by_image/pyspark-notebook/units/unit_pandas_version.py diff --git a/tests/image_specific_tests/pyspark-notebook/units/unit_spark.py b/tests/by_image/pyspark-notebook/units/unit_spark.py similarity index 100% rename from tests/image_specific_tests/pyspark-notebook/units/unit_spark.py rename to tests/by_image/pyspark-notebook/units/unit_spark.py diff --git a/tests/image_specific_tests/pytorch-notebook/units/unit_pytorch.py b/tests/by_image/pytorch-notebook/units/unit_pytorch.py similarity index 100% rename from tests/image_specific_tests/pytorch-notebook/units/unit_pytorch.py rename to tests/by_image/pytorch-notebook/units/unit_pytorch.py diff --git a/tests/image_specific_tests/r-notebook/test_R_mimetypes.py b/tests/by_image/r-notebook/test_R_mimetypes.py similarity index 100% rename from tests/image_specific_tests/r-notebook/test_R_mimetypes.py rename to tests/by_image/r-notebook/test_R_mimetypes.py diff --git a/tests/image_specific_tests/scipy-notebook/data/cython/helloworld.pyx b/tests/by_image/scipy-notebook/data/cython/helloworld.pyx similarity index 100% rename from tests/image_specific_tests/scipy-notebook/data/cython/helloworld.pyx rename to tests/by_image/scipy-notebook/data/cython/helloworld.pyx diff --git a/tests/image_specific_tests/scipy-notebook/data/cython/setup.py b/tests/by_image/scipy-notebook/data/cython/setup.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/data/cython/setup.py rename to tests/by_image/scipy-notebook/data/cython/setup.py diff --git a/tests/image_specific_tests/scipy-notebook/data/matplotlib/matplotlib_1.py b/tests/by_image/scipy-notebook/data/matplotlib/matplotlib_1.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/data/matplotlib/matplotlib_1.py rename to tests/by_image/scipy-notebook/data/matplotlib/matplotlib_1.py diff --git a/tests/image_specific_tests/scipy-notebook/data/matplotlib/matplotlib_fonts_1.py b/tests/by_image/scipy-notebook/data/matplotlib/matplotlib_fonts_1.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/data/matplotlib/matplotlib_fonts_1.py rename to tests/by_image/scipy-notebook/data/matplotlib/matplotlib_fonts_1.py diff --git a/tests/image_specific_tests/scipy-notebook/test_cython.py b/tests/by_image/scipy-notebook/test_cython.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/test_cython.py rename to tests/by_image/scipy-notebook/test_cython.py diff --git a/tests/image_specific_tests/scipy-notebook/test_extensions.py b/tests/by_image/scipy-notebook/test_extensions.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/test_extensions.py rename to tests/by_image/scipy-notebook/test_extensions.py diff --git a/tests/image_specific_tests/scipy-notebook/test_matplotlib.py b/tests/by_image/scipy-notebook/test_matplotlib.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/test_matplotlib.py rename to tests/by_image/scipy-notebook/test_matplotlib.py diff --git a/tests/image_specific_tests/scipy-notebook/units/unit_pandas.py b/tests/by_image/scipy-notebook/units/unit_pandas.py similarity index 100% rename from tests/image_specific_tests/scipy-notebook/units/unit_pandas.py rename to tests/by_image/scipy-notebook/units/unit_pandas.py diff --git a/tests/image_specific_tests/tensorflow-notebook/units/unit_tensorflow.py b/tests/by_image/tensorflow-notebook/units/unit_tensorflow.py similarity index 100% rename from tests/image_specific_tests/tensorflow-notebook/units/unit_tensorflow.py rename to tests/by_image/tensorflow-notebook/units/unit_tensorflow.py diff --git a/tests/hierarchy/get_test_dirs.py b/tests/hierarchy/get_test_dirs.py index e9165ec8..b6c6c500 100644 --- a/tests/hierarchy/get_test_dirs.py +++ b/tests/hierarchy/get_test_dirs.py @@ -5,7 +5,7 @@ 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" +IMAGE_SPECIFIC_TESTS_DIR = THIS_DIR.parent / "by_image" assert IMAGE_SPECIFIC_TESTS_DIR.exists(), f"{IMAGE_SPECIFIC_TESTS_DIR} does not exist."