Python: Make ModelUsage test language agnostic

RasmusWL · RasmusWL · commit 0509228296f3 · 2020-02-19T14:12:22.000+01:00
diff --git a/python/ql/test/library-tests/modules/usage/ModuleUsage.expected b/python/ql/test/library-tests/modules/usage/ModuleUsage.expected
@@ -1,4 +1,3 @@
-| file://:0:0:0:0 | Module builtins | isUsedAsModule |
 | file://:0:0:0:0 | Module sys | isUsedAsModule |
 | imported.py:0:0:0:0 | Module imported | isUsedAsModule |
 | main.py:0:0:0:0 | Module main | isUsedAsScript |
diff --git a/python/ql/test/library-tests/modules/usage/ModuleUsage.ql b/python/ql/test/library-tests/modules/usage/ModuleUsage.ql
@@ -2,11 +2,15 @@ import python
 
 from ModuleValue mv, string usage
 where
-    mv.isUsedAsModule() and usage = "isUsedAsModule"
-    or
-    mv.isUsedAsScript() and usage = "isUsedAsScript"
-    or
-    not mv.isUsedAsModule() and
-    not mv.isUsedAsScript() and
-    usage = "<UNKNOWN>"
+    // builtin module has different name in Python 2 and 3
+    not mv = Module::builtinModule() and
+    (
+        mv.isUsedAsModule() and usage = "isUsedAsModule"
+        or
+        mv.isUsedAsScript() and usage = "isUsedAsScript"
+        or
+        not mv.isUsedAsModule() and
+        not mv.isUsedAsScript() and
+        usage = "<UNKNOWN>"
+    )
 select mv, usage

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-\| file://:0:0:0:0 \| Module builtins \| isUsedAsModule \|`
`2`	`1`	`\| file://:0:0:0:0 \| Module sys \| isUsedAsModule \|`
`3`	`2`	`\| imported.py:0:0:0:0 \| Module imported \| isUsedAsModule \|`
`4`	`3`	`\| main.py:0:0:0:0 \| Module main \| isUsedAsScript \|`