Skip to content

Fix regular expression used in NLCOMP test #4964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
billsacks merged 6 commits into from
Apr 14, 2026
+32 −1
Merged

Fix regular expression used in NLCOMP test #4964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de2adeb
Fix regular expression used in NLCOMP test
mnlevy1981 Apr 13, 2026
2ea4efe
add doctests
jedwards4b Apr 14, 2026
b81606e
Fix regular expression and add unit test
mnlevy1981 Apr 14, 2026
3700d30
Updates from black via pre-commit
mnlevy1981 Apr 14, 2026
e77fe0b
Add a few more unit tests
mnlevy1981 Apr 14, 2026
c19d517
Add a couple short comments to new test module
mnlevy1981 Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CIME/simple_compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@ def _normalize_string_value(value, case):
Some of the strings are inherently prone to diffs, like file
paths, etc. This function attempts to normalize that data so that
it will not cause diffs.
>>> _normalize_string_value("ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.G.20260410_135953_nhg5ae","ERS.TL319_t232.G1850MARBL_JRA.derecho_intel")
'ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.ACTION.TESTID'
>>> _normalize_string_value("ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.GC.20260410_135953_nhg5ae","ERS.TL319_t232.G1850MARBL_JRA.derecho_intel")
'ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.ACTION.TESTID'
>>> _normalize_string_value("ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.C.20260410_135953_nhg5ae","ERS.TL319_t232.G1850MARBL_JRA.derecho_intel")
'ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.ACTION.TESTID'
>>> _normalize_string_value("ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.GG.20260410_135953_nhg5ae","ERS.TL319_t232.G1850MARBL_JRA.derecho_intel")
'ERS.TL319_t232.G1850MARBL_JRA.derecho_intel.GG.20260410_135953_nhg5ae'
"""
# Any occurance of case must be normalized because test-ids might not match
if case is not None:
case_re = re.compile(r"{}[.]([GC])[.]([^./\s]+)".format(case))
case_re = re.compile(r"{}[.](GC?|C)[.]([^./\s]+)".format(case))
value = case_re.sub("{}.ACTION.TESTID".format(case), value)

if "/" in value:
Expand Down
23 changes: 23 additions & 0 deletions CIME/tests/test_simple_compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import unittest

from CIME.simple_compare import _normalize_string_value


class TestSimpleCompare(unittest.TestCase):
def test_normalize_string_values(self):
test = "test.grid.compset.mach_compiler"
testid = "19991231_235959_abcdef"

# Test cases where _normalize_string_value() will normalize test
for action in ["G", "C", "GC"]:
assert (
_normalize_string_value(f"{test}.{action}.{testid}", test)
== f"{test}.ACTION.TESTID"
)

# Test cases where _normalize_string_value() will not change test
for action in ["GG", "CC", "CG"]:
assert (
_normalize_string_value(f"{test}.{action}.{testid}", test)
== f"{test}.{action}.{testid}"
)
Loading