Python: update call graph test

yoff · yoff · commit 5ca6391f150f · 2020-06-19T07:49:47.000+02:00
we also have flow into functions!
diff --git a/python/ql/test/experimental/dataflow/callGraph.expected b/python/ql/test/experimental/dataflow/callGraph.expected
@@ -1 +1,2 @@
 | test.py:4:10:4:10 | ControlFlowNode for z | test.py:7:5:7:20 | ControlFlowNode for obfuscated_id() |
+| test.py:7:19:7:19 | ControlFlowNode for a | test.py:1:19:1:19 | SSA variable x |
diff --git a/python/ql/test/experimental/dataflow/callGraphConfig.qll b/python/ql/test/experimental/dataflow/callGraphConfig.qll
@@ -8,9 +8,13 @@ class CallGraphConfig extends DataFlow::Configuration {
 
   override predicate isSource(DataFlow::Node node) {
     node instanceof DataFlow::ReturnNode
+    or
+    node instanceof DataFlow::ArgumentNode
   }
 
   override predicate isSink(DataFlow::Node node) {
     node instanceof DataFlow::OutNode
+    or
+    node instanceof DataFlow::ParameterNode
   }
 }
diff --git a/python/ql/test/experimental/dataflow/callGraphSinks.expected b/python/ql/test/experimental/dataflow/callGraphSinks.expected
@@ -1 +1,2 @@
+| test.py:1:19:1:19 | SSA variable x |
 | test.py:7:5:7:20 | ControlFlowNode for obfuscated_id() |
diff --git a/python/ql/test/experimental/dataflow/callGraphSources.expected b/python/ql/test/experimental/dataflow/callGraphSources.expected
@@ -1 +1,2 @@
 | test.py:4:10:4:10 | ControlFlowNode for z |
+| test.py:7:19:7:19 | ControlFlowNode for a |

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`\| test.py:4:10:4:10 \| ControlFlowNode for z \| test.py:7:5:7:20 \| ControlFlowNode for obfuscated_id() \|`
	`2`	`+\| test.py:7:19:7:19 \| ControlFlowNode for a \| test.py:1:19:1:19 \| SSA variable x \|`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,13 @@ class CallGraphConfig extends DataFlow::Configuration {`
`8`	`8`
`9`	`9`	`override predicate isSource(DataFlow::Node node) {`
`10`	`10`	`node instanceof DataFlow::ReturnNode`
	`11`	`+ or`
	`12`	`+ node instanceof DataFlow::ArgumentNode`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`override predicate isSink(DataFlow::Node node) {`
`14`	`16`	`node instanceof DataFlow::OutNode`
	`17`	`+ or`
	`18`	`+ node instanceof DataFlow::ParameterNode`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+\| test.py:1:19:1:19 \| SSA variable x \|`
`1`	`2`	`\| test.py:7:5:7:20 \| ControlFlowNode for obfuscated_id() \|`