Merge pull request #2767 from RasmusWL/python-six-tests

Python: Update expected six results

Author: tausbn

python/ql/test/2/library-tests/six/options

@@ -1,2 +1,2 @@
-semmle-extractor-options: --lang=2 --max-import-depth=3
+semmle-extractor-options: --lang=2 --max-import-depth=4
 optimize: true

python/ql/test/2/library-tests/six/pointsto.expected

@@ -1,3 +1,9 @@
-| six | Module six |
-| six.moves | Module six.moves |
+| six | Package six |
+| six.moves | Package six.moves |
+| six.moves.http_client | Module httplib |
+| six.moves.http_client.HTTPConnection | class HTTPConnection |
 | six.moves.range | builtin-class xrange |
+| six.moves.urllib | Package six.moves.urllib |
+| six.moves.urllib.parse | Module six.moves.urllib_parse |
+| six.moves.urllib.parse.urlsplit | Function urlsplit |
+| six.moves.zip | builtin-class itertools.izip |

python/ql/test/2/library-tests/six/pointsto.ql

@@ -1,15 +1,11 @@
-
 import python
 
 string longname(Expr e) {
     result = e.(Name).getId()
     or
-    exists(Attribute a |
-        a = e |
-        result = longname(a.getObject()) + "." + a.getName()
-    )
+    exists(Attribute a | a = e | result = longname(a.getObject()) + "." + a.getName())
 }
 
-from Expr e, Object o
-where e.refersTo(o) and e.getLocation().getFile().getShortName() = "test.py"
-select longname(e), o.toString()
+from Expr e, Value v
+where e.pointsTo(v) and e.getLocation().getFile().getShortName() = "test.py"
+select longname(e), v.toString()

python/ql/test/2/library-tests/six/test.expected

@@ -1,5 +1,9 @@
 import six
 
-#Check that some expected attributes are visible
+# Check that some expected attributes are visible -- this is the reason we added stubs in
+# the first place! If this works, we're happy!
 six.moves
 six.moves.range
+six.moves.zip
+six.moves.http_client.HTTPConnection
+six.moves.urllib.parse.urlsplit

python/ql/test/2/library-tests/six/test.py

@@ -1,2 +1,2 @@
-semmle-extractor-options: --max-import-depth=3
+semmle-extractor-options: --max-import-depth=4
 optimize: true

python/ql/test/2/library-tests/six/test.ql

@@ -1,3 +1,9 @@
-| six | Module six |
-| six.moves | Module six.moves |
+| six | Package six |
+| six.moves | Package six.moves |
+| six.moves.http_client | Module http.client |
+| six.moves.http_client.HTTPConnection | class HTTPConnection |
 | six.moves.range | builtin-class range |
+| six.moves.urllib | Package six.moves.urllib |
+| six.moves.urllib.parse | Module six.moves.urllib_parse |
+| six.moves.urllib.parse.urlsplit | Function urlsplit |
+| six.moves.zip | builtin-class zip |

python/ql/test/3/library-tests/six/options

@@ -1,16 +1,11 @@
-
 import python
 
 string longname(Expr e) {
     result = e.(Name).getId()
     or
-    exists(Attribute a |
-        a = e |
-        result = longname(a.getObject()) + "." + a.getName()
-    )
+    exists(Attribute a | a = e | result = longname(a.getObject()) + "." + a.getName())
 }
 
-from Expr e, Object o
-where e.refersTo(o) and e.getLocation().getFile().getShortName() = "test.py"
-select longname(e), o.toString()
-
+from Expr e, Value v
+where e.pointsTo(v) and e.getLocation().getFile().getShortName() = "test.py"
+select longname(e), v.toString()