Merge pull request #1520 from pyiron/tests

Refactor tests
pyiron · Jul 10, 2024 · 00c5c80 · 00c5c80
2 parents abf9170 + 6bd92fd
commit 00c5c80
Show file tree

Hide file tree

Showing 92 changed files with 6 additions and 73 deletions.
diff --git a/.ci_support/test_backwards.sh b/.ci_support/test_backwards.sh
diff --git a/.github/variables/cache_number.env b/.github/variables/cache_number.env
diff --git a/.github/workflows/atomistics-compat.yml b/.github/workflows/atomistics-compat.yml
@@ -20,18 +20,12 @@ jobs:
         include:
           - operating-system: macos-latest
             python-version: '3.12'
-            label: osx-64-py-3-12
-            prefix: /Users/runner/miniconda3/envs/my-env
 
           - operating-system: windows-latest
             python-version: '3.12'
-            label: win-64-py-3-12
-            prefix: C:\Miniconda3\envs\my-env
 
           - operating-system: ubuntu-latest
             python-version: '3.12'
-            label: linux-64-py-3-12
-            prefix: /usr/share/miniconda3/envs/my-env
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/backwards.yml b/.github/workflows/backwards.yml
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -15,18 +15,12 @@ jobs:
         include:
         - operating-system: macos-latest
           python-version: '3.12'
-          label: osx-64-py-3-12
-          prefix: /Users/runner/miniconda3/envs/my-env
 
         - operating-system: windows-latest
           python-version: '3.12'
-          label: win-64-py-3-12
-          prefix: C:\Miniconda3\envs\my-env
 
         - operating-system: ubuntu-latest
           python-version: '3.12'
-          label: linux-64-py-3-12
-          prefix: /usr/share/miniconda3/envs/my-env
 
     steps:
     - uses: actions/checkout@v4
@@ -46,4 +40,4 @@ jobs:
       run: |
         python .ci_support/pyironconfig.py
         bash .ci_support/pip_install.sh
-        python -m unittest discover test_benchmarks
+        python -m unittest discover tests/benchmarks
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -26,22 +26,18 @@ jobs:
         - operating-system: ubuntu-latest
           python-version: '3.12'
           label: linux-64-py-3-12
-          prefix: /usr/share/miniconda3/envs/my-env
 
         - operating-system: ubuntu-latest
           python-version: '3.11'
           label: linux-64-py-3-11
-          prefix: /usr/share/miniconda3/envs/my-env
 
         - operating-system: ubuntu-latest
           python-version: '3.10'
           label: linux-64-py-3-10
-          prefix: /usr/share/miniconda3/envs/my-env
 
         - operating-system: ubuntu-latest
           python-version: 3.9
           label: linux-64-py-3-9
-          prefix: /usr/share/miniconda3/envs/my-env
 
     steps:
     - uses: actions/checkout@v4
@@ -61,7 +57,7 @@ jobs:
       run: |
         python .ci_support/pyironconfig.py
         bash .ci_support/pip_install.sh
-        coverage run --omit="pyiron_base/_version.py,tests/*" -m unittest discover tests
+        coverage run --omit="pyiron_base/_version.py,tests/*" -m unittest discover tests/unit
         coverage xml
     - name: Coveralls
       if: matrix.label == 'linux-64-py-3-11'

diff --git a/.github/workflows/unittests_old.yml b/.github/workflows/unittests_old.yml
@@ -25,4 +25,4 @@ jobs:
       timeout-minutes: 30
       run: |
         bash .ci_support/pip_install.sh
-        python -m unittest discover tests
+        python -m unittest discover tests/unit
diff --git a/test_benchmarks/__init__.py → tests/benchmarks/__init__.py b/test_benchmarks/__init__.py → tests/benchmarks/__init__.py
diff --git a/test_benchmarks/generic/__init__.py → tests/benchmarks/generic/__init__.py b/test_benchmarks/generic/__init__.py → tests/benchmarks/generic/__init__.py
diff --git a/test_benchmarks/generic/test_filehdfio.py → tests/benchmarks/generic/test_filehdfio.py b/test_benchmarks/generic/test_filehdfio.py → tests/benchmarks/generic/test_filehdfio.py
diff --git a/tests/__init__.py → tests/unit/__init__.py b/tests/__init__.py → tests/unit/__init__.py
diff --git a/tests/archiving/__init__.py → tests/unit/archiving/__init__.py b/tests/archiving/__init__.py → tests/unit/archiving/__init__.py
diff --git a/tests/unit/archiving/test/nested/imported/test/toy.h5 b/tests/unit/archiving/test/nested/imported/test/toy.h5
diff --git a/tests/archiving/test_export.py → tests/unit/archiving/test_export.py b/tests/archiving/test_export.py → tests/unit/archiving/test_export.py
diff --git a/tests/archiving/test_import.py → tests/unit/archiving/test_import.py b/tests/archiving/test_import.py → tests/unit/archiving/test_import.py
diff --git a/...ds/test_dill_cloudpickle_compatibility.py → ...ds/test_dill_cloudpickle_compatibility.py b/...ds/test_dill_cloudpickle_compatibility.py → ...ds/test_dill_cloudpickle_compatibility.py
diff --git a/tests/backwards/test_scriptjob_load.py → tests/unit/backwards/test_scriptjob_load.py b/tests/backwards/test_scriptjob_load.py → tests/unit/backwards/test_scriptjob_load.py
diff --git a/tests/backwards/test_scriptjob_save.py → tests/unit/backwards/test_scriptjob_save.py b/tests/backwards/test_scriptjob_save.py → tests/unit/backwards/test_scriptjob_save.py
diff --git a/tests/backwards/test_tablejob_load.py → tests/unit/backwards/test_tablejob_load.py b/tests/backwards/test_tablejob_load.py → tests/unit/backwards/test_tablejob_load.py
diff --git a/tests/backwards/test_tablejob_save.py → tests/unit/backwards/test_tablejob_save.py b/tests/backwards/test_tablejob_save.py → tests/unit/backwards/test_tablejob_save.py
diff --git a/tests/database/__init__.py → tests/unit/database/__init__.py b/tests/database/__init__.py → tests/unit/database/__init__.py
diff --git a/tests/database/test_database_access.py → tests/unit/database/test_database_access.py b/tests/database/test_database_access.py → tests/unit/database/test_database_access.py
diff --git a/tests/database/test_database_file.py → tests/unit/database/test_database_file.py b/tests/database/test_database_file.py → tests/unit/database/test_database_file.py
diff --git a/tests/database/test_filetable.py → tests/unit/database/test_filetable.py b/tests/database/test_filetable.py → tests/unit/database/test_filetable.py
diff --git a/tests/database/test_manager.py → tests/unit/database/test_manager.py b/tests/database/test_manager.py → tests/unit/database/test_manager.py
diff --git a/tests/database/test_no_database_project.py → ...unit/database/test_no_database_project.py b/tests/database/test_no_database_project.py → ...unit/database/test_no_database_project.py
diff --git a/tests/flex/__init__.py → tests/unit/flex/__init__.py b/tests/flex/__init__.py → tests/unit/flex/__init__.py
diff --git a/tests/flex/test_executablecontainer.py → tests/unit/flex/test_executablecontainer.py b/tests/flex/test_executablecontainer.py → tests/unit/flex/test_executablecontainer.py
diff --git a/tests/flex/test_executablecontainer_conda.py → ...it/flex/test_executablecontainer_conda.py b/tests/flex/test_executablecontainer_conda.py → ...it/flex/test_executablecontainer_conda.py
diff --git a/tests/flex/test_pythonfunctioncontainer.py → ...unit/flex/test_pythonfunctioncontainer.py b/tests/flex/test_pythonfunctioncontainer.py → ...unit/flex/test_pythonfunctioncontainer.py
diff --git a/tests/flex/test_wrap_executable.py → tests/unit/flex/test_wrap_executable.py b/tests/flex/test_wrap_executable.py → tests/unit/flex/test_wrap_executable.py
diff --git a/tests/generic/__init__.py → tests/unit/generic/__init__.py b/tests/generic/__init__.py → tests/unit/generic/__init__.py
diff --git a/tests/generic/test_datacontainer.py → tests/unit/generic/test_datacontainer.py b/tests/generic/test_datacontainer.py → tests/unit/generic/test_datacontainer.py
diff --git a/tests/generic/test_factory.py → tests/unit/generic/test_factory.py b/tests/generic/test_factory.py → tests/unit/generic/test_factory.py
diff --git a/tests/generic/test_filedata.py → tests/unit/generic/test_filedata.py b/tests/generic/test_filedata.py → tests/unit/generic/test_filedata.py
diff --git a/tests/generic/test_fileio.py → tests/unit/generic/test_fileio.py b/tests/generic/test_fileio.py → tests/unit/generic/test_fileio.py
diff --git a/tests/generic/test_flattenedstorage.py → tests/unit/generic/test_flattenedstorage.py b/tests/generic/test_flattenedstorage.py → tests/unit/generic/test_flattenedstorage.py
diff --git a/tests/generic/test_genericParameters.py → tests/unit/generic/test_genericParameters.py b/tests/generic/test_genericParameters.py → tests/unit/generic/test_genericParameters.py
diff --git a/tests/generic/test_hdfstub.py → tests/unit/generic/test_hdfstub.py b/tests/generic/test_hdfstub.py → tests/unit/generic/test_hdfstub.py
diff --git a/tests/generic/test_object.py → tests/unit/generic/test_object.py b/tests/generic/test_object.py → tests/unit/generic/test_object.py
diff --git a/tests/generic/test_units.py → tests/unit/generic/test_units.py b/tests/generic/test_units.py → tests/unit/generic/test_units.py
diff --git a/tests/generic/test_util.py → tests/unit/generic/test_util.py b/tests/generic/test_util.py → tests/unit/generic/test_util.py
diff --git a/tests/interfaces/__init__.py → tests/unit/interfaces/__init__.py b/tests/interfaces/__init__.py → tests/unit/interfaces/__init__.py
diff --git a/tests/interfaces/test_hashdf.py → tests/unit/interfaces/test_hashdf.py b/tests/interfaces/test_hashdf.py → tests/unit/interfaces/test_hashdf.py
diff --git a/tests/job/__init__.py → tests/unit/job/__init__.py b/tests/job/__init__.py → tests/unit/job/__init__.py
diff --git a/tests/job/test_childids.py → tests/unit/job/test_childids.py b/tests/job/test_childids.py → tests/unit/job/test_childids.py
diff --git a/tests/job/test_copyto.py → tests/unit/job/test_copyto.py b/tests/job/test_copyto.py → tests/unit/job/test_copyto.py
diff --git a/tests/job/test_databaseproperties.py → tests/unit/job/test_databaseproperties.py b/tests/job/test_databaseproperties.py → tests/unit/job/test_databaseproperties.py
diff --git a/tests/job/test_dynamic.py → tests/unit/job/test_dynamic.py b/tests/job/test_dynamic.py → tests/unit/job/test_dynamic.py
diff --git a/tests/job/test_executable.py → tests/unit/job/test_executable.py b/tests/job/test_executable.py → tests/unit/job/test_executable.py
diff --git a/tests/job/test_external.py → tests/unit/job/test_external.py b/tests/job/test_external.py → tests/unit/job/test_external.py
diff --git a/tests/job/test_factory.py → tests/unit/job/test_factory.py b/tests/job/test_factory.py → tests/unit/job/test_factory.py
diff --git a/tests/job/test_genericJob.py → tests/unit/job/test_genericJob.py b/tests/job/test_genericJob.py → tests/unit/job/test_genericJob.py
diff --git a/tests/master/__init__.py → ...hout_hdf5_hdf5/job_without_hdf5/error.out b/tests/master/__init__.py → ...hout_hdf5_hdf5/job_without_hdf5/error.out
diff --git a/tests/job/test_hdf5content.py → tests/unit/job/test_hdf5content.py b/tests/job/test_hdf5content.py → tests/unit/job/test_hdf5content.py
diff --git a/tests/job/test_interactivewrapper.py → tests/unit/job/test_interactivewrapper.py b/tests/job/test_interactivewrapper.py → tests/unit/job/test_interactivewrapper.py
diff --git a/tests/job/test_jobStatus.py → tests/unit/job/test_jobStatus.py b/tests/job/test_jobStatus.py → tests/unit/job/test_jobStatus.py
diff --git a/tests/job/test_job_interactive.py → tests/unit/job/test_job_interactive.py b/tests/job/test_job_interactive.py → tests/unit/job/test_job_interactive.py
diff --git a/tests/job/test_jobtype.py → tests/unit/job/test_jobtype.py b/tests/job/test_jobtype.py → tests/unit/job/test_jobtype.py
diff --git a/tests/job/test_jobtypechoice.py → tests/unit/job/test_jobtypechoice.py b/tests/job/test_jobtypechoice.py → tests/unit/job/test_jobtypechoice.py
diff --git a/tests/job/test_script.py → tests/unit/job/test_script.py b/tests/job/test_script.py → tests/unit/job/test_script.py
diff --git a/tests/job/test_worker.py → tests/unit/job/test_worker.py b/tests/job/test_worker.py → tests/unit/job/test_worker.py
diff --git a/tests/project/__init__.py → tests/unit/master/__init__.py b/tests/project/__init__.py → tests/unit/master/__init__.py
diff --git a/tests/master/test_GenericMaster.py → tests/unit/master/test_GenericMaster.py b/tests/master/test_GenericMaster.py → tests/unit/master/test_GenericMaster.py
diff --git a/tests/master/test_parallelmaster.py → tests/unit/master/test_parallelmaster.py b/tests/master/test_parallelmaster.py → tests/unit/master/test_parallelmaster.py
diff --git a/tests/server/__init__.py → tests/unit/project/__init__.py b/tests/server/__init__.py → tests/unit/project/__init__.py
diff --git a/tests/project/test_data.py → tests/unit/project/test_data.py b/tests/project/test_data.py → tests/unit/project/test_data.py
diff --git a/tests/project/test_genericPath.py → tests/unit/project/test_genericPath.py b/tests/project/test_genericPath.py → tests/unit/project/test_genericPath.py
diff --git a/tests/project/test_jobloader.py → tests/unit/project/test_jobloader.py b/tests/project/test_jobloader.py → tests/unit/project/test_jobloader.py
diff --git a/tests/project/test_maintenance.py → tests/unit/project/test_maintenance.py b/tests/project/test_maintenance.py → tests/unit/project/test_maintenance.py
diff --git a/tests/project/test_project.py → tests/unit/project/test_project.py b/tests/project/test_project.py → tests/unit/project/test_project.py
diff --git a/tests/project/test_projectPath.py → tests/unit/project/test_projectPath.py b/tests/project/test_projectPath.py → tests/unit/project/test_projectPath.py
diff --git a/tests/state/__init__.py → tests/unit/server/__init__.py b/tests/state/__init__.py → tests/unit/server/__init__.py
diff --git a/tests/server/test_runmode.py → tests/unit/server/test_runmode.py b/tests/server/test_runmode.py → tests/unit/server/test_runmode.py
diff --git a/tests/server/test_server.py → tests/unit/server/test_server.py b/tests/server/test_server.py → tests/unit/server/test_server.py
diff --git a/tests/server/test_submissionStatus.py → tests/unit/server/test_submissionStatus.py b/tests/server/test_submissionStatus.py → tests/unit/server/test_submissionStatus.py
diff --git a/tests/storage/__init__.py → tests/unit/state/__init__.py b/tests/storage/__init__.py → tests/unit/state/__init__.py
diff --git a/tests/state/test_install.py → tests/unit/state/test_install.py b/tests/state/test_install.py → tests/unit/state/test_install.py
diff --git a/tests/state/test_publications.py → tests/unit/state/test_publications.py b/tests/state/test_publications.py → tests/unit/state/test_publications.py
diff --git a/tests/state/test_queue_adapter.py → tests/unit/state/test_queue_adapter.py b/tests/state/test_queue_adapter.py → tests/unit/state/test_queue_adapter.py
diff --git a/tests/state/test_settings.py → tests/unit/state/test_settings.py b/tests/state/test_settings.py → tests/unit/state/test_settings.py
diff --git a/tests/table/__init__.py → tests/unit/storage/__init__.py b/tests/table/__init__.py → tests/unit/storage/__init__.py
diff --git a/tests/storage/test_fileHDFio.py → tests/unit/storage/test_fileHDFio.py b/tests/storage/test_fileHDFio.py → tests/unit/storage/test_fileHDFio.py
@@ -88,7 +88,9 @@ def setUpClass(cls):
         cls.empty_hdf5 = FileHDFio(file_name=cls.current_dir + "/filehdfio_empty.h5")
         cls.full_hdf5 = FileHDFio(file_name=cls.current_dir + "/filehdfio_full.h5")
         cls.i_o_hdf5 = FileHDFio(file_name=cls.current_dir + "/filehdfio_io.h5")
-        cls.es_hdf5 = FileHDFio(file_name=cls.current_dir + "/../static/dft/es_hdf.h5")
+        cls.es_hdf5 = FileHDFio(
+            file_name=cls.current_dir + "/../../static/dft/es_hdf.h5"
+        )
         with cls.full_hdf5.open("content") as hdf:
             _write_full_hdf_content(hdf=hdf)
         with cls.i_o_hdf5.open("content") as hdf:

diff --git a/tests/storage/test_has_stored_traits.py → tests/unit/storage/test_has_stored_traits.py b/tests/storage/test_has_stored_traits.py → tests/unit/storage/test_has_stored_traits.py
diff --git a/tests/storage/test_helper_functions.py → tests/unit/storage/test_helper_functions.py b/tests/storage/test_helper_functions.py → tests/unit/storage/test_helper_functions.py
diff --git a/...s/storage/test_module_path_maintenance.py → ...t/storage/test_module_path_maintenance.py b/...s/storage/test_module_path_maintenance.py → ...t/storage/test_module_path_maintenance.py
diff --git a/tests/utils/__init__.py → tests/unit/table/__init__.py b/tests/utils/__init__.py → tests/unit/table/__init__.py
diff --git a/tests/table/test_datamining.py → tests/unit/table/test_datamining.py b/tests/table/test_datamining.py → tests/unit/table/test_datamining.py
diff --git a/tests/test_testwithproject.py → tests/unit/test_testwithproject.py b/tests/test_testwithproject.py → tests/unit/test_testwithproject.py
diff --git a/tests/test_toolkit.py → tests/unit/test_toolkit.py b/tests/test_toolkit.py → tests/unit/test_toolkit.py
diff --git a/tests/unit/utils/__init__.py b/tests/unit/utils/__init__.py
diff --git a/tests/utils/test_strtobool.py → tests/unit/utils/test_strtobool.py b/tests/utils/test_strtobool.py → tests/unit/utils/test_strtobool.py