Fix using old check ids in excluded checks

This was broken since the old ids in exclude_checks were never mapped
to new ones.

Author: khaledhosny

Lib/fontbakery/checkrunner.py

@@ -139,9 +139,7 @@ def _get(self, name, iterargs, condition=False):
             f"This can't happen: asked for {name} but nothing provides it."
         )
 
-    def _get_check_dependencies(
-        self, identity: Identity
-    ) -> Union[
+    def _get_check_dependencies(self, identity: Identity) -> Union[
         Tuple[None, dict],  # Either we got args
         Tuple[Subresult, None],  # or we return a Skipped message
     ]:
@@ -238,6 +236,17 @@ def _run_check(self, identity: Identity):
 
     @property
     def order(self) -> Tuple[Identity, ...]:
+        # map old excluded check ids to new ones
+        _exclude_checks = None
+        if self._exclude_checks:
+            _exclude_checks = []
+            for excluded in self._exclude_checks:
+                if excluded in old_to_new:
+                    self.legacy_checkid_references.add(excluded)
+                    _exclude_checks.append(old_to_new[excluded])
+                else:
+                    _exclude_checks.append(excluded)
+
         _order = []
         for section in self.profile.sections:
             for check in section.checks:
@@ -260,15 +269,13 @@ def order(self) -> Tuple[Identity, ...]:
                     if not selected_via_legacy_checkid and not selected_via_new_checkid:
                         continue
 
-                if self._exclude_checks:
-                    if any(excluded in check.id for excluded in self._exclude_checks):
+                if _exclude_checks:
+                    if any(excluded in check.id for excluded in _exclude_checks):
                         continue
 
                     if check.id in self.new_to_old:
                         for legacy in self.new_to_old[check.id]:
-                            if any(
-                                excluded in legacy for excluded in self._exclude_checks
-                            ):
+                            if any(excluded in legacy for excluded in _exclude_checks):
                                 self.legacy_checkid_references.add(legacy)
                                 continue
 

tests/test_external_profile.py

@@ -96,3 +96,26 @@ def test_in_and_exclude_checks_default():
 
     checks = profile_checks(fakemodule, {"explicit_checks": ["opentype/unitsperem"]})
     assert checks == ["opentype/unitsperem"]
+
+
+def test_exclude_checks_old_ids():
+    from fontbakery.legacy_checkids import renaming_map
+
+    fakemodule = FakeModule()
+    setattr(
+        fakemodule,
+        "PROFILE",
+        {
+            "include_profiles": ["microsoft"],
+            "sections": {},
+        },
+    )
+
+    old = "com.microsoft/check/vendor_url"
+    new = renaming_map[old]
+
+    checks = profile_checks(fakemodule)
+    assert new in checks
+
+    checks = profile_checks(fakemodule, {"exclude_checks": [old]})
+    assert new not in checks