From 0ce30535e2cacf20722042bde4bb03cdc65e5416 Mon Sep 17 00:00:00 2001
From: Dominic Hofer <6570912+dominichofer@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:03:52 +0100
Subject: [PATCH] Clean up system tests

---
 test/system_test.py | 84 ++++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/test/system_test.py b/test/system_test.py
index e3135ad11b..3616c1aebc 100644
--- a/test/system_test.py
+++ b/test/system_test.py
@@ -2,29 +2,29 @@
 from spack_commands import spack_install
 
 
-def test_install_libfyaml_default():
-    spack_install('libfyaml', test_root=False)
-
-
-def test_install_libtorch_default():
-    spack_install('libtorch', test_root=False)
+def test_install_clang_format():
+    spack_install('clang-format')
 
 
 @pytest.mark.parametrize("version", ['2.25.0.1', '2.19.0.7'])
 def test_install_cosmo_eccodes_definitions_version(version):
-    spack_install(f'cosmo-eccodes-definitions @{version}', test_root=False)
+    spack_install(f'cosmo-eccodes-definitions @{version}')
+
+
+def test_install_ecbuild():
+    spack_install('ecbuild @3.7.2')
 
 
-def test_install_eccodes_2_19_0():
-    spack_install('eccodes @2.19.0', test_root=False)
+def test_install_flexpart_cosmo():
+    spack_install('flexpart-cosmo')
 
 
 def test_install_flexpart_ifs():
-    spack_install('flexpart-ifs', test_root=False)
+    spack_install('flexpart-ifs')
 
 
-def test_install_flexpart_cosmo():
-    spack_install('flexpart-cosmo @V8C4.0')
+#TODO: Add test for icon-c2sm
+#TODO: Add test for icon-ham
 
 
 def test_install_icon_mch_2_6_6_mch2b_nvhpc():
@@ -47,54 +47,51 @@ def test_install_icon_mch_conditional_dependencies():
 
 
 def test_install_icontools():
-    spack_install('icontools @2.5.2')
+    spack_install('icontools')
 
 
 def test_install_int2lm_3_00_nvhpc():
-    spack_install('int2lm @int2lm-3.00 %nvhpc', test_root=False)
+    spack_install('int2lm @int2lm-3.00 %nvhpc')
+    
 
+def test_install_libfyaml():
+    spack_install('libfyaml')
 
-def test_install_libgrib1_22_01_2020_nvhpc():
-    spack_install('libgrib1 @22-01-2020 %nvhpc')
 
-
-def test_install_makedepf90():
-    spack_install('makedepf90 @3.0.1', test_root=False)
+def test_install_libgrib1_22_01_2020_nvhpc():
+    spack_install('libgrib1 %nvhpc')
 
 
-def test_install_oasis_version_4_0_nvhpc():
-    spack_install('oasis @4.0 %nvhpc')
+def test_install_libtorch():
+    spack_install('libtorch', test_root=False)
 
 
-def test_install_pytorch_fortran_version_0_4():
-    spack_install(
-        'pytorch-fortran@0.4%nvhpc ^pytorch-fortran-proxy@0.4%gcc ^python@3.10 ^gmake%gcc ^cmake%gcc',
-        test_root=False)
+def test_install_makedepf90():
+    spack_install('makedepf90')
 
 
-def test_install_pytorch_fortran_proxy_version_0_4():
-    spack_install('pytorch-fortran-proxy@0.4%gcc ^python@3.10',
-                  test_root=False)
+def test_install_oasis_nvhpc():
+    spack_install('oasis %nvhpc')
 
 
-def test_install_py_cytoolz_install_default():
+def test_install_py_cytoolz():
     spack_install('py-cytoolz')
 
 
-def test_install_py_devtools_install_default():
+def test_install_py_devtools():
     spack_install('py-devtools')
 
 
-def test_install_py_factory_boy_install_default():
+def test_install_py_factory_boy():
     spack_install('py-factory-boy')
 
 
-def test_install_py_gridtools_cpp_install_default():
+def test_install_py_gridtools_cpp():
     spack_install('py-gridtools-cpp')
 
 
 @pytest.mark.parametrize("version", ['1.0.3.7', '1.0.3.9'])
-def test_install_py_gt4py_for_version(version):
+def test_install_py_gt4py_version(version):
     spack_install(f'py-gt4py @{version}')
 
 
@@ -102,25 +99,34 @@ def test_install_py_icon4py():
     spack_install('py-icon4py')
 
 
-def test_install_py_hatchling_default():
+def test_install_py_hatchling():
     spack_install('py-hatchling')
 
 
-def test_install_py_inflection_default():
+def test_install_py_inflection():
     spack_install('py-inflection')
 
 
-def test_install_py_pytest_factoryboy_default():
+def test_install_py_pytest_factoryboy():
     spack_install('py-pytest-factoryboy')
 
 
-def test_install_py_tabulate_default():
+def test_install_py_tabulate():
     spack_install('py-tabulate')
 
 
-def test_install_py_typing_extensions_default():
+def test_install_py_typing_extensions():
     spack_install('py-typing-extensions')
 
 
-def test_install_yaxt_default():
+def test_install_pytorch_fortran():
+    spack_install(
+        'pytorch-fortran %nvhpc ^pytorch-fortran-proxy@0.4%gcc ^python@3.10 ^gmake%gcc ^cmake%gcc')
+
+
+def test_install_pytorch_fortran_proxy():
+    spack_install('pytorch-fortran-proxy %gcc ^python@3.10')
+
+
+def test_install_yaxt():
     spack_install('yaxt')