From b54b175f1573cab46fd364571f1f5918e6d28c56 Mon Sep 17 00:00:00 2001 From: Jason Boutte Date: Thu, 10 Oct 2024 15:57:55 -0700 Subject: [PATCH] Fixes asserting module path --- CIME/tests/test_unit_system_tests_mvk.py | 28 +++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/CIME/tests/test_unit_system_tests_mvk.py b/CIME/tests/test_unit_system_tests_mvk.py index e18768c987c..56eaa39f67e 100644 --- a/CIME/tests/test_unit_system_tests_mvk.py +++ b/CIME/tests/test_unit_system_tests_mvk.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -import re import os import json import unittest import tempfile import contextlib +import sysconfig from pathlib import Path from unittest import mock @@ -186,12 +186,10 @@ def evv_test_config(case, config): module = config["20240515_212034_41b5u2"].pop("module") assert ( - re.search( - r"/opt/conda/lib/python.*/site-packages/evv4esm/extensions/kso.py", - module, - ) - is not None + f'{sysconfig.get_paths()["purelib"]}/evv4esm/extensions/kso.py' + == module ) + assert config == expected_config nml_files = [x for x in os.listdir(temp_dir) if x.startswith("user_nl")] @@ -386,12 +384,9 @@ def test_testmod_simple(self, evv, find_test_mods): module = config["20240515_212034_41b5u2"].pop("module") assert ( - re.search( - r"/opt/conda/lib/python.*/site-packages/evv4esm/extensions/ks.py", - module, - ) - is not None + f'{sysconfig.get_paths()["purelib"]}/evv4esm/extensions/ks.py' == module ) + assert config == expected_config nml_files = [x for x in os.listdir(temp_dir) if x.startswith("user_nl")] @@ -516,7 +511,7 @@ def test__generate_baseline(self, evv, append_testlog, _generate_baseline): files = os.listdir(case_baseline_dir) - assert files == ["test1.nc", "test2.nc"] + assert sorted(files) == sorted(["test1.nc", "test2.nc"]) # reset side_effect case.get_value.side_effect = side_effect @@ -528,7 +523,7 @@ def test__generate_baseline(self, evv, append_testlog, _generate_baseline): files = os.listdir(case_baseline_dir) - assert files == ["test1.nc", "test2.nc"] + assert sorted(files) == sorted(["test1.nc", "test2.nc"]) @mock.patch("CIME.SystemTests.mvk.append_testlog") @mock.patch("CIME.SystemTests.mvk.evv") @@ -603,12 +598,9 @@ def test__compare_baseline(self, evv, append_testlog): module = config["20240515_212034_41b5u2"].pop("module") assert ( - re.search( - r"/opt/conda/lib/python.*/site-packages/evv4esm/extensions/ks.py", - module, - ) - is not None + f'{sysconfig.get_paths()["purelib"]}/evv4esm/extensions/ks.py' == module ) + assert config == expected_config expected_comments = f"""BASELINE PASS for test '20240515_212034_41b5u2'.