Merge pull request #3053 from tausbn/python-make-test-not-depend-on-minor-version

RasmusWL · web-flow · commit b45f8ff41d44 · 2020-03-13T10:56:40.000+01:00
Python: Make two tests not depend on minor Python version.
diff --git a/python/ql/src/Imports/SyntaxError.ql b/python/ql/src/Imports/SyntaxError.ql
@@ -14,4 +14,4 @@ import python
 
 from SyntaxError error
 where not error instanceof EncodingError
-select error, error.getMessage() + " (in Python " +  major_version() + "." + minor_version() + ")."
+select error, error.getMessage() + " (in Python " +  major_version() + ")."
diff --git a/python/ql/test/2/query-tests/Imports/syntax_error/SyntaxError.expected b/python/ql/test/2/query-tests/Imports/syntax_error/SyntaxError.expected
@@ -1 +1 @@
-| nonsense.py:1:14:1:14 | Syntax Error | Syntax Error (in Python 2.7). |
+| nonsense.py:1:14:1:14 | Syntax Error | Syntax Error (in Python 2). |
diff --git a/python/ql/test/3/query-tests/Imports/syntax_error/SyntaxError.expected b/python/ql/test/3/query-tests/Imports/syntax_error/SyntaxError.expected
@@ -1 +1 @@
-| nonsense.py:1:2:1:2 | Syntax Error | Syntax Error (in Python 3.5). |
+| nonsense.py:1:2:1:2 | Syntax Error | Syntax Error (in Python 3). |
diff --git a/python/ql/test/query-tests/Imports/unused/options b/python/ql/test/query-tests/Imports/unused/options
@@ -0,0 +1 @@
+semmle-extractor-options: --max-import-depth=0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| nonsense.py:1:14:1:14 \| Syntax Error \| Syntax Error (in Python 2.7). \|`
	`1`	`+\| nonsense.py:1:14:1:14 \| Syntax Error \| Syntax Error (in Python 2). \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| nonsense.py:1:2:1:2 \| Syntax Error \| Syntax Error (in Python 3.5). \|`
	`1`	`+\| nonsense.py:1:2:1:2 \| Syntax Error \| Syntax Error (in Python 3). \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+semmle-extractor-options: --max-import-depth=0`