Format and use f-strings

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/licensedcode/licensedcode_test_utils.py

@@ -64,7 +64,7 @@ def __attrs_post_init__(self, *args, **kwargs):
                 with io.open(self.data_file, encoding='utf-8') as df:
                     data = saneyaml.load(df.read()) or {}
             except Exception as e:
-                raise Exception('Failed to read:', 'file://' + self.data_file, e)
+                raise Exception(f'Failed to read: file://{self.data_file}', e)
 
             self.license_expressions = data.pop('license_expressions', [])
             self.notes = data.pop('notes', None)
@@ -83,22 +83,23 @@ def __attrs_post_init__(self, *args, **kwargs):
                 except:
                     raise Exception(
                         'Unable to parse License rule expression: '
-                        +repr(exp) + ' for: file://' + self.data_file +
-                        '\n' + traceback.format_exc()
-                )
+                        f'{exp!r} for: file://{self.data_file}\n' +
+                        traceback.format_exc()
+                    )
                 if expression is None:
                     raise Exception(
                         'Unable to parse License rule expression: '
-                        +repr(exp) + ' for:' + repr(self.data_file))
-
+                        f'{exp!r} for: file://{self.data_file}'
+                    )
                 new_exp = expression.render()
                 self.license_expressions[i] = new_exp
 
         else:
             if not self.notes:
                 raise Exception(
                     'A license test without expected license_expressions should '
-                    'have explanatory notes:  for: file://' + self.data_file)
+                    f'have explanatory notes:  for: file://{self.data_file}'
+                )
 
     def to_dict(self):
         dct = {}
@@ -165,8 +166,9 @@ def build_tests(test_dir, clazz, regen=False):
 
         # avoid duplicated test method
         if hasattr(clazz, test_name):
-            msg = ('Duplicated test method name: {test_name}: file://{test_file}'
-            ).format(**locals())
+            msg = (
+                f'Duplicated test method name: {test_name}: file://{test_file}'
+            )
             raise Exception(msg)
 
         # attach that method to our license_test class
@@ -219,30 +221,28 @@ def closure_test_function(*args, **kwargs):
                 results_failure_trace.extend(['',
                     '======= MATCH ====', repr(match),
                     '======= Matched Query Text for:',
-                    'file://{test_file}'.format(**locals())
+                    f'file://{test_file}'
                 ])
                 if test_data_file:
-                    results_failure_trace.append(
-                        'file://{test_data_file}'.format(**locals()))
+                    results_failure_trace.append(f'file://{test_data_file}')
 
                 results_failure_trace.append('')
                 results_failure_trace.append(qtext)
                 results_failure_trace.extend(['',
                     '======= Matched Rule Text for:',
-                    'file://{rule_text_file}'.format(**locals()),
-                    'file://{rule_data_file}'.format(**locals()),
+                    f'file://{rule_text_file}',
+                    f'file://{rule_data_file}',
                     '',
                     itext,
                 ])
             if not matches:
                 results_failure_trace.extend(['',
                     '======= NO MATCH ====',
                     '======= Not Matched Query Text for:',
-                    'file://{test_file}'.format(**locals())
+                    f'file://{test_file}'
                 ])
                 if test_data_file:
-                    results_failure_trace.append(
-                        'file://{test_data_file}'.format(**locals()))
+                    results_failure_trace.append(f'file://{test_data_file}')
 
             # this assert will always fail and provide a detailed failure trace
             assert '\n'.join(results_failure_trace) == '\n'.join(expected)

tests/licensedcode/test_detection_validate.py

@@ -39,7 +39,7 @@ def make_validation_test(rule, test_name):
     if rule.is_false_positive:
 
         def closure_test_function(*args, **kwargs):
-            check_special_rule_can_be_detected(rule)
+            check_special_rule_cannot_be_detected(rule)
 
     else:
 
@@ -53,24 +53,18 @@ def closure_test_function(*args, **kwargs):
     return closure_test_function
 
 
-def check_special_rule_can_be_detected(rule):
+def check_special_rule_cannot_be_detected(rule):
     idx = cache.get_index()
     results = idx.match(location=rule.text_file)
-    try:
-        assert not results
-    except:
+    if results:
         data_file = rule.data_file
         if not data_file:
             data_file = rule.text_file.replace('.LICENSE', '.yml')
         # On failure, we compare againto get additional failure details such as
         # a clickable text_file path
-        results = (
-            results,
-            f'file://{data_file}',
-            f'file://{rule.text_file}',
-        )
+        results = (results, f'file://{data_file}', f'file://{rule.text_file}')
         # this assert will always fail and provide a more detailed failure trace
-        assert not results
+        assert  results == []
 
 
 def check_rule_or_license_can_be_self_detected_exactly(rule):
@@ -240,6 +234,7 @@ class TestValidateLicenseExtended5(unittest.TestCase):
 
 
 _rules = sorted(models.get_rules(), key=lambda r: r.identifier)
+
 build_validation_tests(
     _rules,
     test_classes=[
@@ -251,4 +246,5 @@ class TestValidateLicenseExtended5(unittest.TestCase):
         TestValidateLicenseExtended5,
      ]
 )
+
 del _rules