Python: Adapt twisted tests so they pass

RasmusWL · RasmusWL · commit 4e3c18367694 · 2019-12-18T10:42:39.000+01:00
diff --git a/python/ql/test/library-tests/web/twisted/Classes.expected b/python/ql/test/library-tests/web/twisted/Classes.expected
@@ -1,8 +1,5 @@
-| class ErrorPage | resources/lib/python/lib/twisted/web/resource.py:280 |
-| class ForbiddenResource | resources/lib/python/lib/twisted/web/resource.py:348 |
 | class MyRequestHandler1 | test.py:3 |
 | class MyRequestHandler2 | test.py:23 |
 | class MyRequestHandler3 | test.py:27 |
 | class MyRequestHandler4 | test.py:38 |
 | class MyRequestHandler5 | test.py:42 |
-| class NoResource | resources/lib/python/lib/twisted/web/resource.py:338 |
diff --git a/python/ql/test/library-tests/web/twisted/Methods.expected b/python/ql/test/library-tests/web/twisted/Methods.expected
@@ -1,9 +1,4 @@
-| __init__ | Function __init__ | resources/lib/python/lib/twisted/web/resource.py:316 |
-| __init__ | Function __init__ | resources/lib/python/lib/twisted/web/resource.py:343 |
-| __init__ | Function __init__ | resources/lib/python/lib/twisted/web/resource.py:353 |
-| getChild | Function getChild | resources/lib/python/lib/twisted/web/resource.py:333 |
 | myrender | Function myrender | test.py:24 |
-| render | Function render | resources/lib/python/lib/twisted/web/resource.py:323 |
 | render | Function render | test.py:4 |
 | render | Function render | test.py:28 |
 | render | Function render | test.py:39 |
diff --git a/python/ql/test/library-tests/web/twisted/Sinks.expected b/python/ql/test/library-tests/web/twisted/Sinks.expected
@@ -1,6 +1,3 @@
-| resources/lib/python/lib/twisted/web/resource.py:325 | Str | externally controlled string |
-| resources/lib/python/lib/twisted/web/resource.py:329 | Attribute() | externally controlled string |
-| resources/lib/python/lib/twisted/web/resource.py:330 | interpolated | externally controlled string |
 | test.py:7 | response | externally controlled string |
 | test.py:14 | response | externally controlled string |
 | test.py:21 | response | externally controlled string |
diff --git a/python/ql/test/library-tests/web/twisted/Sources.expected b/python/ql/test/library-tests/web/twisted/Sources.expected
@@ -1,5 +1,3 @@
-| resources/lib/python/lib/twisted/web/resource.py:323 | request | twisted.request.http.Request |
-| resources/lib/python/lib/twisted/web/resource.py:333 | request | twisted.request.http.Request |
 | test.py:4 | request | twisted.request.http.Request |
 | test.py:9 | request | twisted.request.http.Request |
 | test.py:16 | request | twisted.request.http.Request |
diff --git a/python/ql/test/library-tests/web/twisted/Taint.expected b/python/ql/test/library-tests/web/twisted/Taint.expected
@@ -1,7 +1,3 @@
-| resources/lib/python/lib/twisted/web/resource.py:323 | request | twisted.request.http.Request |
-| resources/lib/python/lib/twisted/web/resource.py:324 | request | twisted.request.http.Request |
-| resources/lib/python/lib/twisted/web/resource.py:325 | request | twisted.request.http.Request |
-| resources/lib/python/lib/twisted/web/resource.py:333 | request | twisted.request.http.Request |
 | test.py:4 | request | twisted.request.http.Request |
 | test.py:5 | Attribute | externally controlled string |
 | test.py:5 | request | twisted.request.http.Request |
diff --git a/python/ql/test/library-tests/web/twisted/options b/python/ql/test/library-tests/web/twisted/options
@@ -1,2 +1,2 @@
-semmle-extractor-options: --max-import-depth=3 -p ../../../../resources/lib/python/lib/ --respect-init=False
+semmle-extractor-options: --max-import-depth=1 -p ../../../query-tests/Security/lib/
 optimize: true
diff --git a/python/ql/test/query-tests/Security/lib/twisted/__init__.py b/python/ql/test/query-tests/Security/lib/twisted/__init__.py
diff --git a/python/ql/test/query-tests/Security/lib/twisted/web/__init__.py b/python/ql/test/query-tests/Security/lib/twisted/web/__init__.py
diff --git a/python/ql/test/query-tests/Security/lib/twisted/web/http.py b/python/ql/test/query-tests/Security/lib/twisted/web/http.py
@@ -0,0 +1,2 @@
+class Request(object):
+    pass
diff --git a/python/ql/test/query-tests/Security/lib/twisted/web/resource.py b/python/ql/test/query-tests/Security/lib/twisted/web/resource.py
@@ -0,0 +1,2 @@
+class Resource(object):
+    pass

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-\| resources/lib/python/lib/twisted/web/resource.py:323 \| request \| twisted.request.http.Request \|`
`2`		`-\| resources/lib/python/lib/twisted/web/resource.py:333 \| request \| twisted.request.http.Request \|`
`3`	`1`	`\| test.py:4 \| request \| twisted.request.http.Request \|`
`4`	`2`	`\| test.py:9 \| request \| twisted.request.http.Request \|`
`5`	`3`	`\| test.py:16 \| request \| twisted.request.http.Request \|`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-semmle-extractor-options: --max-import-depth=3 -p ../../../../resources/lib/python/lib/ --respect-init=False`
	`1`	`+semmle-extractor-options: --max-import-depth=1 -p ../../../query-tests/Security/lib/`
`2`	`2`	`optimize: true`