Fix/tests in master (#2592)

This commit is contained in:
Willi Ballenthin
2025-02-04 21:48:13 +01:00
committed by GitHub
parent 5467fac1a5
commit 40203a0f83
2 changed files with 5 additions and 3 deletions

View File

@@ -58,6 +58,8 @@ def capability_rules(doc: rd.ResultDocument) -> Iterator[rd.RuleMatches]:
for _, _, rule in sort_rules(doc.rules):
if rule.meta.lib:
continue
if (rule.meta.namespace or "").startswith("internal/"):
continue
if rule.meta.is_subscope_rule:
continue
if rule.meta.maec.analysis_conclusion:

View File

@@ -2227,8 +2227,8 @@ def get_rules(
on_load_rule(path, i, total_rule_count)
try:
rule = capa.rules.Rule.from_yaml(content.decode("utf-8"))
except capa.rules.InvalidRule:
rule = Rule.from_yaml(content.decode("utf-8"))
except InvalidRule:
raise
else:
rule.meta["capa/path"] = path.as_posix()
@@ -2237,7 +2237,7 @@ def get_rules(
rules.append(rule)
logger.debug("loaded rule: '%s' with scope: %s", rule.name, rule.scopes)
ruleset = capa.rules.RuleSet(rules)
ruleset = RuleSet(rules)
capa.rules.cache.cache_ruleset(cache_dir, ruleset)