Merge pull request #782 from markshannon/python-add-more-tests

Python: Add more tests

Author: taus-semmle

python/ql/src/Statements/ExecUsed.ql

@@ -19,7 +19,7 @@ string message() {
 }
 
 predicate exec_function_call(Call c) {
-	major_version() = 3 and exists(GlobalVariable exec | exec = ((Name)c.getFunc()).getVariable() and exec.getId() = "exec")
+    exists(GlobalVariable exec | exec = ((Name)c.getFunc()).getVariable() and exec.getId() = "exec")
 }
 
 from AstNode exec

python/ql/src/semmle/python/TestUtils.qll

@@ -22,3 +22,11 @@ string remove_prefix_before_substring(string str, string sub) {
 string remove_library_prefix(Location loc) {
   result = remove_prefix_before_substring(loc.toString(), "resources/lib")
 }
+
+/** Returns the location of an AST node in compact form: `basename:line:column` */
+string compact_location(AstNode a) {
+    exists(Location l |
+        l = a.getLocation() |
+        result = l.getFile().getBaseName() + ":" + l.getStartLine() + ":" + l.getStartColumn()
+    )
+}

python/ql/test/library-tests/ControlFlow/general/Comments.expected

@@ -1 +1,2 @@
 | Module flowtest | 5 |
+| Module imports | 0 |

python/ql/test/library-tests/ControlFlow/general/Lines.expected

@@ -8,3 +8,4 @@
 | Function try_except | 7 |
 | Function try_finally | 7 |
 | Module flowtest | 70 |
+| Module imports | 4 |

python/ql/test/library-tests/ControlFlow/general/imports.py

@@ -0,0 +1,4 @@
+from foo import x, y
+import bar
+from baz import x as a, y as b
+import spam as eggs

python/ql/test/library-tests/ControlFlow/successors/Successors.expected

@@ -0,0 +1,18 @@
+import python
+import semmle.python.TestUtils
+
+from ControlFlowNode p, ControlFlowNode s, string what
+where
+s = p.getAFalseSuccessor() and what = "false"
+or
+s = p.getATrueSuccessor() and what = "true"
+or
+s = p.getAnExceptionalSuccessor() and what = "exceptional"
+or
+s = p.getANormalSuccessor() and what = "normal"
+or
+// Add fake edges for node that raise out of scope
+p.isExceptionalExit(_) and s = p.getScope().getEntryNode() and what = "exit"
+
+select compact_location(p.getNode()), p.getNode().toString(),
+       compact_location(s.getNode()), s.getNode().toString(), what