[sonar] Use a more specific Python exception.

diff --git a/teshsuite/smpi/MBI/MBIutils.py b/teshsuite/smpi/MBI/MBIutils.py
index 433466f..070d321 100644 (file)
--- a/teshsuite/smpi/MBI/MBIutils.py
+++ b/teshsuite/smpi/MBI/MBIutils.py
@@ -113,12 +113,12 @@ def parse_one_code(filename):
                 if state == 0:
                     state = 1
                 else:
-                    raise Exception(f"MBI_TESTS header appears a second time at line {line_num}: \n{line}")
+                    raise ValueError(f"MBI_TESTS header appears a second time at line {line_num}: \n{line}")
             elif re.match(".*END_MBI_TESTS.*", line):
                 if state == 1:
                     state = 2
                 else:
-                    raise Exception(f"Unexpected end of MBI_TESTS header at line {line_num}: \n{line}")
+                    raise ValueError(f"Unexpected end of MBI_TESTS header at line {line_num}: \n{line}")
             if state == 1 and re.match("\s+\$ ?.*", line):
                 m = re.match('\s+\$ ?(.*)', line)
                 cmd = m.group(1)
@@ -129,12 +129,12 @@ def parse_one_code(filename):
                 else:
                     m = re.match('[ |]*ERROR: *(.*)', nextline)
                     if not m:
-                        raise Exception(
+                        raise ValueError(
                             f"\n{filename}:{line_num}: MBI parse error: Test not followed by a proper 'ERROR' line:\n{line}{nextline}")
                     expect = 'ERROR'
                     detail = m.group(1)
                     if detail not in possible_details:
-                        raise Exception(
+                        raise ValueError(
                             f"\n{filename}:{line_num}: MBI parse error: Detailled outcome {detail} is not one of the allowed ones.")
                 test = {'filename': filename, 'id': test_num, 'cmd': cmd, 'expect': expect, 'detail': detail}
                 res.append(test.copy())
@@ -142,12 +142,12 @@ def parse_one_code(filename):
                 line_num += 1
 
     if state == 0:
-        raise Exception(f"MBI_TESTS header not found in file '{filename}'.")
+        raise ValueError(f"MBI_TESTS header not found in file '{filename}'.")
     if state == 1:
-        raise Exception(f"MBI_TESTS header not properly ended in file '{filename}'.")
+        raise ValueError(f"MBI_TESTS header not properly ended in file '{filename}'.")
 
     if len(res) == 0:
-        raise Exception(f"No test found in {filename}. Please fix it.")
+        raise ValueError(f"No test found in {filename}. Please fix it.")
     return res
 
 def categorize(tool, toolname, test_id, expected):
@@ -157,7 +157,7 @@ def categorize(tool, toolname, test_id, expected):
         if outcome == 'failure':
             elapsed = 0
         else:
-            raise Exception(f"Invalid test result: {test_id}.txt exists but not {test_id}.elapsed")
+            raise ValueError(f"Invalid test result: {test_id}.txt exists but not {test_id}.elapsed")
     else:
         with open(f'{test_id}.elapsed' if os.path.exists(f'{test_id}.elapsed') else f'logs/{toolname}/{test_id}.elapsed', 'r') as infile:
             elapsed = infile.read()
@@ -193,7 +193,7 @@ def categorize(tool, toolname, test_id, expected):
             res_category = 'TRUE_POS'
             diagnostic =  f'correctly detected an error'
     else:
-        raise Exception(f"Unexpected expectation: {expected} (must be OK or ERROR)")
+        raise ValueError(f"Unexpected expectation: {expected} (must be OK or ERROR)")
 
     return (res_category, elapsed, diagnostic, outcome)
 

diff --git a/teshsuite/smpi/MBI/generator_utils.py b/teshsuite/smpi/MBI/generator_utils.py
index e978b1e..6c96d66 100644 (file)
--- a/teshsuite/smpi/MBI/generator_utils.py
+++ b/teshsuite/smpi/MBI/generator_utils.py
@@ -433,7 +433,7 @@ def find_line(content, target, filename):
             #print(f'Found {target} at {line}')
             return res
         res += 1
-    raise Exception(f"Line target {target} not found in {filename}.")
+    raise ValueError(f"Line target {target} not found in {filename}.")
 
 
 def make_file(template, filename, replace):
@@ -449,7 +449,7 @@ def make_file(template, filename, replace):
             output = re.sub(f'@\{{{target}\}}@', replace[target], output)
             #print(f"Replace {target} -> {replace[target]}")
         else:
-            raise Exception(f"Variable {target} used in template, but not defined.")
+            raise ValueError(f"Variable {target} used in template, but not defined.")
     # Now replace all variables with a ':' in their name: line targets are like that, and we don't want to resolve them before the others change the lines
     while re.search("@\{([^:@]*):([^@]*)\}@", output):
         m = re.search("@\{([^:@]*):([^@]*)\}@", output)
@@ -459,7 +459,7 @@ def make_file(template, filename, replace):
             #print(f"Replace @{{line:{target}}}@ with '{replace}'")
             output = re.sub(f'@\{{line:{target}\}}@', replace, output)
         else:
-            raise Exception(f"Unknown variable kind: {kind}:{target}")
+            raise ValueError(f"Unknown variable kind: {kind}:{target}")
 
     if os.path.exists(filename):
         with open(filename, 'r') as file: