Changeset 28129 for issm/trunk-jpl/test/NightlyRun/IdFromString.py

Timestamp:

03/05/24 17:20:06 (13 months ago)

Author:

jdquinn

Message:

CHG: Corrections to how test suites are parsed under Python

File:

• issm/trunk-jpl/test/NightlyRun/IdFromString.py (modified) (4 diffs)

issm/trunk-jpl/test/NightlyRun/IdFromString.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+from GetAvailableTestIds import *
 from IdToName import IdToName
 import os
@@ -8 +10 @@
 
 def IdFromString(string, verbose=False):
-    """
-    IDFROMSTRING - output ids from a given string
-        Usage:
-            ids = IdFromString(string)
-        Examples:
-            ids = IdFromString('Parallel')
-            ids = IdFromString('79North')
-            ids = IdFromString(' * ')
+    """IdFromString - output ids from a given string
+
+    Usage:
+        ids = IdFromString(string)
+    
+    Examples:
+        ids = IdFromString('Dakota')
+        ids = IdFromString('Slc')
+        ids = IdFromString(' * ')
     """
 
-#Check input
+    # Check input
     if not isinstance(string, str):
         raise TypeError('IdFromString error message: input argument is not a string.')
@@ -24 +27 @@
     string = string.replace('"', '')
 
-#Get the test ids and names and scan for matches
-
+    # Get the test ids and names and scan for matches
     ids = []
     idnames = []
-    flist = [f for f in os.listdir('.') if re.match('test[0-9]+.py', f)] # File name must follow the format "test<integer>.py"
-    list_ids = [int(re.search(r'\d+',file.split('.')[0]).group()) for file in flist] # Retrieve test IDs
-    for i in list_ids:
+    available_test_ids = GetAvailableTestIds()
+    for i in available_test_ids:
         name = IdToName(i)
         if (string == ' * ') or (name is not None and string in name):
@@ -36 +37 @@
             idnames.append(name)
 
-#Return if no test found
+    # Return if no test found
     if not ids:
         print("No test matches '%s'." % string)
         return ids
 
-#Display names
+    # Display names
     if verbose:
         idnames = [i for _, i in sorted(zip(ids, idnames), key=lambda pair: pair[0])]