From aa13e8eea921059e93c8be105f622ad86389f4ca Mon Sep 17 00:00:00 2001
From: Jithu Murugan <j.murugan@fz-juelich.de>
Date: Fri, 21 Feb 2025 16:21:15 +0100
Subject: [PATCH] - Corrected the failing unit tests and minor refactorings.
---
dedal/tests/unit_tests/test_build_cache_manager.py | 10 +++++++---
.../tests/unit_tests/test_spack_operation_use_cache.py | 4 +---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dedal/tests/unit_tests/test_build_cache_manager.py b/dedal/tests/unit_tests/test_build_cache_manager.py
index 2a80149b..af5690eb 100644
--- a/dedal/tests/unit_tests/test_build_cache_manager.py
+++ b/dedal/tests/unit_tests/test_build_cache_manager.py
@@ -60,12 +60,16 @@ class TestBuildCacheManager:
result = mock_build_cache_manager.get_public_key_from_cache(str(build_cache_dir))
# Assert
+ # Cannot assure the order in which the OS returns the files,
+ # hence check if the result is in the expected list
assert result in [str(build_cache_dir / "project0" / "_pgp" / "key0.pub"),
str(build_cache_dir / "project0" / "_pgp" / "key1.pub"),
str(build_cache_dir / "project1" / "_pgp" / "key0.pub")]
- log = (expected_log_message, pgp_folders, pgp_folders[0]) if test_id == "more_than_one_gpg_folder" else (
- expected_log_message, key_files, key_files[0])
- mock_build_cache_manager._logger.warning.assert_called_once_with(*log)
+ assert mock_build_cache_manager._logger.warning.call_args[0][0] == expected_log_message
+ assert set(mock_build_cache_manager._logger.warning.call_args[0][1]) == set(
+ pgp_folders) if test_id == "more_than_one_gpg_folder" else set(key_files)
+ assert mock_build_cache_manager._logger.warning.call_args[0][
+ 2] in pgp_folders if test_id == "more_than_one_gpg_folder" else key_files
@pytest.mark.parametrize("build_cache_dir, expected_log_message", [
(None, 'Build cache directory does not exist!'),
diff --git a/dedal/tests/unit_tests/test_spack_operation_use_cache.py b/dedal/tests/unit_tests/test_spack_operation_use_cache.py
index e6e96f46..fe5d9da3 100644
--- a/dedal/tests/unit_tests/test_spack_operation_use_cache.py
+++ b/dedal/tests/unit_tests/test_spack_operation_use_cache.py
@@ -5,12 +5,10 @@
# Description: Brief description of the file.
# Created by: Murugan, Jithu <j.murugan@fz-juelich.de>
# Created on: 2025-02-20
-import logging
from pathlib import Path
import pytest
-from dedal.commands.command_runner import CommandRunner
from dedal.error_handling.exceptions import NoSpackEnvironmentException
from dedal.spack_factory.SpackOperationUseCache import SpackOperationUseCache
@@ -51,7 +49,7 @@ class TestSpackOperationUseCache:
spack_operation_use_cache_mock.build_cache.download.assert_called_once_with(
spack_operation_use_cache_mock.spack_config.buildcache_dir)
spack_operation_use_cache_mock.build_cache.get_public_key_from_cache.assert_called_once_with(
- spack_operation_use_cache_mock.spack_config.buildcache_dir)
+ str(spack_operation_use_cache_mock.spack_config.buildcache_dir))
if key_path:
spack_operation_use_cache_mock.trust_gpg_key.assert_called_once_with(key_path)
--
GitLab