Python: Fix test failures.

tausbn · tausbn · commit b990fac97bc6 · 2020-03-30T13:55:38.000+02:00
How could the tests fail because of autoformatting, you may ask?

The answer is deprecation warnings. These specify the location of the deprecated
entity, and due to autoformatting these moved around.
diff --git a/python/ql/test/3/library-tests/PointsTo/consts/BooleanConstants.expected b/python/ql/test/3/library-tests/PointsTo/consts/BooleanConstants.expected
@@ -1,5 +1,5 @@
-WARNING: Predicate points_to has been deprecated and may be removed in future (BooleanConstants.ql:8,5-24)
-WARNING: Predicate points_to has been deprecated and may be removed in future (BooleanConstants.ql:11,5-24)
+WARNING: Predicate points_to has been deprecated and may be removed in future (BooleanConstants.ql:6,25-44)
+WARNING: Predicate points_to has been deprecated and may be removed in future (BooleanConstants.ql:7,29-48)
 | module.py | 2 | ControlFlowNode for ImportExpr | import | true |
 | module.py | 2 | ControlFlowNode for sys | import | true |
 | module.py | 3 | ControlFlowNode for Compare | import | false |
diff --git a/python/ql/test/library-tests/PointsTo/customise/test.expected b/python/ql/test/library-tests/PointsTo/customise/test.expected
@@ -1,4 +1,4 @@
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (test.ql:8,27-51)
+WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (test.ql:9,27-51)
 | 9 | ControlFlowNode for has_type_int | Function has_type_int | builtin-class function |
 | 9 | ControlFlowNode for has_type_int() | has_type_int() | builtin-class int |
 | 9 | ControlFlowNode for x | has_type_int() | builtin-class int |
diff --git a/python/ql/test/library-tests/PointsTo/extensions/Extend.expected b/python/ql/test/library-tests/PointsTo/extensions/Extend.expected
@@ -1,8 +1,8 @@
-WARNING: Predicate points_to has been deprecated and may be removed in future (Extend.ql:58,9-28)
-WARNING: Type CustomPointsToAttribute has been deprecated and may be removed in future (Extend.ql:27,35-58)
-WARNING: Type CustomPointsToObjectFact has been deprecated and may be removed in future (Extend.ql:42,32-56)
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:9,28-52)
-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:55,38-62)
+WARNING: Predicate points_to has been deprecated and may be removed in future (Extend.ql:50,32-51)
+WARNING: Type CustomPointsToAttribute has been deprecated and may be removed in future (Extend.ql:22,34-57)
+WARNING: Type CustomPointsToObjectFact has been deprecated and may be removed in future (Extend.ql:38,32-56)
+WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:5,28-52)
+WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (Extend.ql:49,38-62)
 | test.py:4:1:4:3 | ControlFlowNode for one | int 1 |
 | test.py:5:1:5:3 | ControlFlowNode for two | int 2 |
 | test.py:8:1:8:1 | ControlFlowNode for IntegerLiteral | int 1 |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithContext.expected
@@ -1,4 +1,4 @@
-WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithContext.ql:8,7-26)
+WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithContext.ql:7,7-26)
 | a_simple.py:2 | ControlFlowNode for FloatLiteral | float 1.0 | builtin-class float | 2 | import |
 | a_simple.py:2 | ControlFlowNode for f1 | float 1.0 | builtin-class float | 2 | import |
 | a_simple.py:3 | ControlFlowNode for dict | builtin-class dict | builtin-class type | 3 | import |
diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected b/python/ql/test/library-tests/PointsTo/new/PointsToWithType.expected
@@ -1,4 +1,4 @@
-WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithType.ql:7,7-26)
+WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithType.ql:6,7-26)
 | a_simple.py:2 | ControlFlowNode for FloatLiteral | float 1.0 | builtin-class float | 2 |
 | a_simple.py:2 | ControlFlowNode for f1 | float 1.0 | builtin-class float | 2 |
 | a_simple.py:3 | ControlFlowNode for dict | builtin-class dict | builtin-class type | 3 |
diff --git a/python/ql/test/library-tests/PointsTo/new/SSA.expected b/python/ql/test/library-tests/PointsTo/new/SSA.expected
@@ -1,4 +1,4 @@
-WARNING: Predicate ssa_variable_points_to has been deprecated and may be removed in future (SSA.ql:10,1-33)
+WARNING: Predicate ssa_variable_points_to has been deprecated and may be removed in future (SSA.ql:10,5-37)
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code' | builtin-class str |
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code.package' | builtin-class str |
 | __init__.py:0 | __name___0 = ScopeEntryDefinition | 'code.test_package' | builtin-class str |
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected b/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected
@@ -1,4 +1,4 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:8,43-50)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:7,43-50)
 | test.py:10:11:10:47 | test.py:10 | MyException() | exception.kind |
 | test.py:15:25:15:25 | test.py:15 | e | exception.kind |
 | test.py:16:13:16:34 | test.py:16 | Attribute() | exception.info |
diff --git a/python/ql/test/library-tests/taint/extensions/TestNode.expected b/python/ql/test/library-tests/taint/extensions/TestNode.expected
@@ -1,4 +1,4 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:7,77-84)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:5,77-84)
 | Taint simple.test | visitor.py:10 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:13 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:18 | arg |  |
diff --git a/python/ql/test/library-tests/taint/extensions/TestStep.expected b/python/ql/test/library-tests/taint/extensions/TestStep.expected
@@ -1,5 +1,5 @@
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:9,74-81)
-WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:11,74-81)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:6,77-84)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:8,17-24)
 | Taint simple.test | visitor.py:10 | arg | p2 = simple.test |  -->  | Taint simple.test | visitor.py:13 | arg | p2 = simple.test |
 | Taint simple.test | visitor.py:18 | arg |  |  -->  | Taint simple.test | visitor.py:19 | arg |  |
 | Taint simple.test | visitor.py:19 | arg |  |  -->  | Taint simple.test | visitor.py:26 | Attribute() |  |
diff --git a/python/ql/test/library-tests/taint/general/Contexts.expected b/python/ql/test/library-tests/taint/general/Contexts.expected
@@ -1,5 +1,5 @@
-WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:6,6-17)
-WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:7,14-25)
+WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:5,6-17)
+WARNING: Type CallContext has been deprecated and may be removed in future (Contexts.ql:7,12-23)
 | assignment.py:1 | p0 = simple.test | Function test |
 | assignment.py:1 | p1 = simple.test | Function test |
 | assignment.py:1 | p2 = simple.test | Function test |

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (test.ql:8,27-51)`
	`1`	`+WARNING: Type CustomPointsToOriginFact has been deprecated and may be removed in future (test.ql:9,27-51)`
`2`	`2`	`\| 9 \| ControlFlowNode for has_type_int \| Function has_type_int \| builtin-class function \|`
`3`	`3`	`\| 9 \| ControlFlowNode for has_type_int() \| has_type_int() \| builtin-class int \|`
`4`	`4`	`\| 9 \| ControlFlowNode for x \| has_type_int() \| builtin-class int \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithContext.ql:8,7-26)`
	`1`	`+WARNING: Predicate points_to has been deprecated and may be removed in future (PointsToWithContext.ql:7,7-26)`
`2`	`2`	`\| a_simple.py:2 \| ControlFlowNode for FloatLiteral \| float 1.0 \| builtin-class float \| 2 \| import \|`
`3`	`3`	`\| a_simple.py:2 \| ControlFlowNode for f1 \| float 1.0 \| builtin-class float \| 2 \| import \|`
`4`	`4`	`\| a_simple.py:3 \| ControlFlowNode for dict \| builtin-class dict \| builtin-class type \| 3 \| import \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WARNING: Predicate ssa_variable_points_to has been deprecated and may be removed in future (SSA.ql:10,1-33)`
	`1`	`+WARNING: Predicate ssa_variable_points_to has been deprecated and may be removed in future (SSA.ql:10,5-37)`
`2`	`2`	`\| __init__.py:0 \| __name___0 = ScopeEntryDefinition \| 'code' \| builtin-class str \|`
`3`	`3`	`\| __init__.py:0 \| __name___0 = ScopeEntryDefinition \| 'code.package' \| builtin-class str \|`
`4`	`4`	`\| __init__.py:0 \| __name___0 = ScopeEntryDefinition \| 'code.test_package' \| builtin-class str \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:8,43-50)`
	`1`	`+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:7,43-50)`
`2`	`2`	`\| test.py:10:11:10:47 \| test.py:10 \| MyException() \| exception.kind \|`
`3`	`3`	`\| test.py:15:25:15:25 \| test.py:15 \| e \| exception.kind \|`
`4`	`4`	`\| test.py:16:13:16:34 \| test.py:16 \| Attribute() \| exception.info \|`