Python: Move subprocess.call so super-class detection works

RasmusWL · RasmusWL · commit e7fdfd3d3e16 · 2020-02-19T14:12:22.000+01:00
This is a temporary fix!

Added minimal working example (MWE) as a regression, so it's easier to fix the
real problem.

only Python 3 is facing the problem -- and without --max-import-depth=1 the test
times out at 10 minutes :O
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.expected
@@ -0,0 +1,3 @@
+| mwe_failure.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
+| mwe_failure_2.py:7:1:7:23 | class MyTest | <MISSING BASE TYPE> |
+| mwe_success.py:7:1:7:23 | class MyTest | class TestCase |
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.ql b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/ClassValue.ql
@@ -0,0 +1,10 @@
+import python
+
+// as used in semmle.python.filters.Tests
+
+from ClassValue c, string base
+where
+    c.getScope().getLocation().getFile().getShortName().matches("mwe%.py") and
+    c.getName() = "MyTest" and
+    if exists(c.getABaseType()) then base = c.getABaseType().toString() else base = "<MISSING BASE TYPE>"
+select c, base
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_failure.py b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_failure.py
@@ -0,0 +1,10 @@
+import subprocess
+assert subprocess.call(['run-backup']) == 0
+
+class TestCase:
+    pass
+
+class MyTest(TestCase):
+    pass
+
+# found by /home/rasmus/code/ql/python/ql/test/query-tests/Statements/asserts/AssertLiteralConstant.qlref
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_failure_2.py b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_failure_2.py
@@ -0,0 +1,8 @@
+import subprocess
+assert subprocess.call(['run-backup'])
+
+class TestCase:
+    pass
+
+class MyTest(TestCase):
+    pass
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_success.py b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/mwe_success.py
@@ -0,0 +1,8 @@
+import subprocess
+subprocess.call(['run-backup'])
+
+class TestCase:
+    pass
+
+class MyTest(TestCase):
+    pass
diff --git a/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/options b/python/ql/test/3/library-tests/PointsTo/regressions/subprocess-assert/options
@@ -0,0 +1 @@
+semmle-extractor-options: --lang=3 --max-import-depth=1
diff --git a/python/ql/test/query-tests/Statements/asserts/SideEffectInAssert.expected b/python/ql/test/query-tests/Statements/asserts/SideEffectInAssert.expected
@@ -1,3 +1,3 @@
 | assert.py:5:5:5:20 | Assert | This 'assert' statement contains $@ which may have side effects. | assert.py:5:13:5:19 | Yield | an expression |
 | assert.py:8:5:8:22 | Assert | This 'assert' statement contains $@ which may have side effects. | assert.py:8:12:8:22 | Attribute() | an expression |
-| assert.py:20:1:20:43 | Assert | This 'assert' statement contains $@ which may have side effects. | assert.py:20:8:20:38 | Attribute() | an expression |
+| side_effect.py:5:1:5:43 | Assert | This 'assert' statement contains $@ which may have side effects. | side_effect.py:5:8:5:38 | Attribute() | an expression |
diff --git a/python/ql/test/query-tests/Statements/asserts/assert.py b/python/ql/test/query-tests/Statements/asserts/assert.py
@@ -16,8 +16,8 @@ def assert_tuple(x, y):
     assert ()
     assert (x, y)
 
-import subprocess
-assert subprocess.call(['run-backup']) == 0 # TODO: FN
+
+
 
 
 
diff --git a/python/ql/test/query-tests/Statements/asserts/side_effect.py b/python/ql/test/query-tests/Statements/asserts/side_effect.py
@@ -0,0 +1,5 @@
+# For now, this test lives in its own file, since including them in the top of assert.py
+# messes up the results of the refers-to/points-to analysis
+# see /home/rasmus/code/ql/python/ql/test/library-tests/PointsTo/regressions/subprocess-assert/mwe_failure.py
+import subprocess
+assert subprocess.call(['run-backup']) == 0

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+\| mwe_failure.py:7:1:7:23 \| class MyTest \| <MISSING BASE TYPE> \|`
	`2`	`+\| mwe_failure_2.py:7:1:7:23 \| class MyTest \| <MISSING BASE TYPE> \|`
	`3`	`+\| mwe_success.py:7:1:7:23 \| class MyTest \| class TestCase \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+semmle-extractor-options: --lang=3 --max-import-depth=1`