Python: Don't filter subclass tests away

RasmusWL · RasmusWL · commit 60b784a919a8 · 2023-12-19T17:07:01.000+01:00
diff --git a/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll b/python/ql/lib/semmle/python/frameworks/internal/SubclassFinder.qll
@@ -113,6 +113,9 @@ module NotExposed {
   }
 
   predicate isAllowedModule(Module mod) {
+    // for tests
+    mod.getName() = "find_subclass_test"
+    or
     // don't include anything found in site-packages
     exists(mod.getFile().getRelativePath()) and
     not mod.getFile().getRelativePath().regexpMatch("(?i)((^|/)examples?|^docs)/.*") and
diff --git a/python/ql/src/meta/ClassHierarchy/Find.ql b/python/ql/src/meta/ClassHierarchy/Find.ql
@@ -514,5 +514,9 @@ where
   ) and
   fullyQualifiedToYamlFormat(newModelFullyQualified, type2, path) and
   not Extensions::typeModel(spec, type2, path) and
-  not newModelFullyQualified.regexpMatch("(?i).*tests?_?.*")
+  (
+    not newModelFullyQualified.regexpMatch("(?i).*tests?_?.*")
+    or
+    type2 = "find_subclass_test"
+  )
 select spec.(string), type2, path

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ module NotExposed {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`predicate isAllowedModule(Module mod) {`
	`116`	`+ // for tests`
	`117`	`+ mod.getName() = "find_subclass_test"`
	`118`	`+ or`
`116`	`119`	`// don't include anything found in site-packages`
`117`	`120`	`exists(mod.getFile().getRelativePath()) and`
`118`	`121`	`not mod.getFile().getRelativePath().regexpMatch("(?i)((^\|/)examples?\|^docs)/.*") and`