Python: update test expectations

python/ql/test/2/library-tests/PointsTo/class_properties/ClassValues.expected

@@ -1,12 +1,10 @@
-| mapping | builtin-class collections.defaultdict |
 | mapping | builtin-class dict |
 | mapping | class MyDictSubclass |
-| mapping | class MyMappingABC |
-| mapping | class OrderedDict |
 | neither sequence nor mapping | builtin-class set |
+| neither sequence nor mapping | class MyMappingABC |
+| neither sequence nor mapping | class MySequenceABC |
 | sequence | builtin-class list |
 | sequence | builtin-class str |
 | sequence | builtin-class tuple |
 | sequence | builtin-class unicode |
-| sequence | class MySequenceABC |
 | sequence | class MySequenceImpl |

python/ql/test/2/library-tests/PointsTo/imports2/Runtime.expected

@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | ControlFlowNode for ImportExpr |

python/ql/test/2/library-tests/PointsTo/imports2/RuntimeWithType.expected

@@ -44,14 +44,10 @@
 | test.py | 15 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
 | test.py | 16 | ControlFlowNode for Attribute | class Y | builtin-class type | ControlFlowNode for ClassExpr |
 | test.py | 16 | ControlFlowNode for moduleX | Module package.moduleX | builtin-class module | Entry node for Module package.moduleX |
-| test.py | 19 | ControlFlowNode for ImportExpr | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 19 | ControlFlowNode for tty | Module tty | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 22 | ControlFlowNode for Attribute | Builtin-function exc_info | builtin-class builtin_function_or_method | ControlFlowNode for from sys import * |
 | test.py | 22 | ControlFlowNode for x | Module package.x | builtin-class module | Entry node for Module package.x |
 | test.py | 24 | ControlFlowNode for IntegerLiteral | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 24 | ControlFlowNode for argv | int 0 | builtin-class int | ControlFlowNode for IntegerLiteral |
 | test.py | 27 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |
 | test.py | 31 | ControlFlowNode for argv | list object | builtin-class list | ControlFlowNode for from sys import * |
-| test.py | 33 | ControlFlowNode for ImportExpr | Module socket | builtin-class module | ControlFlowNode for ImportExpr |
-| test.py | 34 | ControlFlowNode for timeout | builtin-class socket.timeout | builtin-class type | ControlFlowNode for from _socket import * |
 | x.py | 2 | ControlFlowNode for ImportExpr | Module sys | builtin-class module | ControlFlowNode for ImportExpr |

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

@@ -1,7 +1,7 @@
 | six | Package six |
 | six.moves | Package six.moves |
-| six.moves.http_client | Module httplib |
-| six.moves.http_client.HTTPConnection | class HTTPConnection |
+| six.moves.http_client | Missing module httplib |
+| six.moves.http_client.HTTPConnection | Missing module attribute httplib.HTTPConnection |
 | six.moves.range | builtin-class xrange |
 | six.moves.urllib | Package six.moves.urllib |
 | six.moves.urllib.parse | Module six.moves.urllib_parse |

python/ql/test/2/query-tests/Summary/LinesOfCode.expected

@@ -1 +1 @@
-| 38 |
+| 11 |