Dedal Release

• Spack methods for creating a spack environment from scratch (SpackOperation);
• Spack methods to create the cashing for a spack environment (SpackOperationCreateCache).
• Spack methods for creating an enironment from cache

dedal/tests/spack_from_scratch_test.py

@@ -4,62 +4,70 @@ import pytest
 
 from esd.error_handling.exceptions import BashCommandException, NoSpackEnvironmentException
 from esd.model.SpackModel import SpackModel
+from esd.spack_manager.enums.SpackManagerEnum import SpackManagerEnum
+from esd.spack_manager.factory.SpackManagerCreator import SpackManagerCreator
 from esd.spack_manager.factory.SpackManagerScratch import SpackManagerScratch
+from esd.utils.utils import file_exists_and_not_empty
 
 
 def test_spack_repo_exists_1():
-    spack_manager = SpackManagerScratch()
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH)
     assert spack_manager.spack_repo_exists('ebrains-spack-builds') == False
 
 
-def test_spack_repo_exists_2():
-    install_dir = Path('./install').resolve()
+def test_spack_repo_exists_2(tmp_path):
+    install_dir = tmp_path
     env = SpackModel('ebrains-spack-builds', install_dir)
-    spack_manager = SpackManagerScratch(env=env)
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env)
     with pytest.raises(NoSpackEnvironmentException):
         spack_manager.spack_repo_exists(env.env_name)
 
 
-# def test_spack_repo_exists_3():
-#     install_dir = Path('./install').resolve()
-#     env = SpackModel('ebrains-spack-builds', install_dir)
-#     spack_manager = SpackManagerScratch(env=env)
-#     spack_manager.setup_spack_env()
-#     assert spack_manager.spack_repo_exists(env.env_name) == False
+def test_spack_repo_exists_3(tmp_path):
+    install_dir = tmp_path
+    env = SpackModel('ebrains-spack-builds', install_dir)
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env)
+    spack_manager.setup_spack_env()
+    assert spack_manager.spack_repo_exists(env.env_name) == False
 
 
-def test_spack_from_scratch_setup_1():
-    install_dir = Path('./install').resolve()
+def test_spack_from_scratch_setup_1(tmp_path):
+    install_dir = tmp_path
     env = SpackModel('ebrains-spack-builds', install_dir,
                      'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', )
-    spack_manager = SpackManagerScratch(env=env, repos=[env], system_name='ebrainslab')
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env,
+                                                                              system_name='ebrainslab')
     spack_manager.setup_spack_env()
-    assert spack_manager.spack_repo_exists(env.env_name) == True
+    assert spack_manager.spack_repo_exists(env.env_name) == False
 
 
-def test_spack_from_scratch_setup_2():
-    install_dir = Path('./install').resolve()
+def test_spack_from_scratch_setup_2(tmp_path):
+    install_dir = tmp_path
     env = SpackModel('ebrains-spack-builds', install_dir,
                      'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', )
     repo = env
-    spack_manager = SpackManagerScratch(env=env, repos=[repo, repo], system_name='ebrainslab')
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env,
+                                                                              repos=[repo, repo],
+                                                                              system_name='ebrainslab')
     spack_manager.setup_spack_env()
     assert spack_manager.spack_repo_exists(env.env_name) == True
 
 
-def test_spack_from_scratch_setup_3():
-    install_dir = Path('./install').resolve()
+def test_spack_from_scratch_setup_3(tmp_path):
+    install_dir = tmp_path
     env = SpackModel('new_env1', install_dir)
     repo = env
-    spack_manager = SpackManagerScratch(env=env, repos=[repo, repo], system_name='ebrainslab')
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env,
+                                                                              repos=[repo, repo],
+                                                                              system_name='ebrainslab')
     with pytest.raises(BashCommandException):
         spack_manager.setup_spack_env()
 
 
-def test_spack_from_scratch_setup_4():
-    install_dir = Path('./install').resolve()
+def test_spack_from_scratch_setup_4(tmp_path):
+    install_dir = tmp_path
     env = SpackModel('new_env2', install_dir)
-    spack_manager = SpackManagerScratch(env=env)
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env)
     spack_manager.setup_spack_env()
     assert spack_manager.spack_env_exists() == True
 
@@ -67,6 +75,47 @@ def test_spack_from_scratch_setup_4():
 def test_spack_not_a_valid_repo():
     env = SpackModel('ebrains-spack-builds', Path(), None)
     repo = env
-    spack_manager = SpackManagerScratch(env=env, repos=[repo], system_name='ebrainslab')
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env,
+                                                                              repos=[repo],
+                                                                              system_name='ebrainslab')
     with pytest.raises(NoSpackEnvironmentException):
         spack_manager.add_spack_repo(repo.path, repo.env_name)
+
+
+def test_spack_from_scratch_concretize_1(tmp_path):
+    install_dir = tmp_path
+    env = SpackModel('ebrains-spack-builds', install_dir,
+                     'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', )
+    repo = env
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo],
+                                                         system_name='ebrainslab')
+    spack_manager.setup_spack_env()
+    spack_manager.concretize_spack_env(force=True)
+    concretization_file_path = spack_manager.env_path / 'spack.lock'
+    assert file_exists_and_not_empty(concretization_file_path) == True
+
+
+def test_spack_from_scratch_concretize_2(tmp_path):
+    install_dir = tmp_path
+    env = SpackModel('ebrains-spack-builds', install_dir,
+                     'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', )
+    repo = env
+    spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo],
+                                                         system_name='ebrainslab')
+    spack_manager.setup_spack_env()
+    spack_manager.concretize_spack_env(force=False)
+    concretization_file_path = spack_manager.env_path / 'spack.lock'
+    assert file_exists_and_not_empty(concretization_file_path) == True
+
+
+def test_spack_from_scratch_concretize_3(tmp_path):
+    install_dir = tmp_path
+    env = SpackModel('ebrains-spack-builds', install_dir,
+                     'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', )
+    repo = env
+    spack_manager  = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env,
+                                                                              repos=[repo, repo],
+                                                                              system_name='ebrainslab')
+    spack_manager.setup_spack_env()
+    concretization_file_path = spack_manager.env_path / 'spack.lock'
+    assert file_exists_and_not_empty(concretization_file_path) == False