Merge pull request #1092 from markshannon/python-fix-2-tests

taus-semmle · web-flow · commit eec59c2c7d58 · 2019-03-15T11:38:34.000+01:00
Python: Update python-2 specific tests for new parser/tokenizer.
diff --git a/python/ql/test/2/library-tests/locations/strings/test.expected b/python/ql/test/2/library-tests/locations/strings/test.expected
@@ -5,7 +5,7 @@
 | 16 | 5 | 17 | 7 | ef |
 | 21 | 1 | 21 | 8 | string |
 | 24 | 1 | 24 | 10 | \n\n\n\n |
-| 27 | 1 | 27 | 14 | \\u0123\\u1234 |
+| 27 | 1 | 27 | 14 | \u0123\u1234 |
 | 30 | 1 | 30 | 9 | word |
 | 33 | 1 | 33 | 14 | \n\n\n\n0 |
 | 36 | 1 | 39 | 3 | \nline 0\nline 1\n |
diff --git a/python/ql/test/2/query-tests/Imports/encoding_error/EncodingError.expected b/python/ql/test/2/query-tests/Imports/encoding_error/EncodingError.expected
@@ -1 +0,0 @@
-| EncodingError.py:5:8:5:8 | Encoding Error | 'ascii' codec can't decode byte 0xc3 in position 47: ordinal not in range(128) |
diff --git a/python/ql/test/2/query-tests/Imports/syntax_error/EncodingError.expected b/python/ql/test/2/query-tests/Imports/syntax_error/EncodingError.expected
@@ -1 +1 @@
-| bad_encoding.py:11:19:11:19 | Encoding Error | 'ascii' codec can't decode byte 0x82 in position 82: ordinal not in range(128) |
+| bad_encoding.py:11:19:11:19 | Encoding Error | 'utf8' codec can't decode byte 0x82 in position 82: invalid start byte |
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:1:1:1 | Syntax Error | Syntax Error (in Python 2.7). |
+| nonsense.py:1:14:1:14 | Syntax Error | Syntax Error (in Python 2.7). |
diff --git a/python/ql/test/2/query-tests/Imports/syntax_error/nonsense.py b/python/ql/test/2/query-tests/Imports/syntax_error/nonsense.py
@@ -1,4 +1,4 @@
- `Twas brillig, and the slithy toves
+`Twas brillig, and the slithy toves
   Did gyre and gimble in the wabe:
 All mimsy were the borogoves,
   And the mome raths outgrabe.

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-\| EncodingError.py:5:8:5:8 \| Encoding Error \| 'ascii' codec can't decode byte 0xc3 in position 47: ordinal not in range(128) \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| bad_encoding.py:11:19:11:19 \| Encoding Error \| 'ascii' codec can't decode byte 0x82 in position 82: ordinal not in range(128) \|`
	`1`	`+\| bad_encoding.py:11:19:11:19 \| Encoding Error \| 'utf8' codec can't decode byte 0x82 in position 82: invalid start byte \|`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| nonsense.py:1:1:1:1 \| Syntax Error \| Syntax Error (in Python 2.7). \|`
	`1`	`+\| nonsense.py:1:14:1:14 \| Syntax Error \| Syntax Error (in Python 2.7). \|`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		- `Twas brillig, and the slithy toves
	`1`	+`Twas brillig, and the slithy toves
`2`	`2`	`Did gyre and gimble in the wabe:`
`3`	`3`	`All mimsy were the borogoves,`
`4`	`4`	`And the mome raths outgrabe.`