aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-08-31 02:14:22 +0200
committerMaximilian Hils <git@maximilianhils.com>2017-09-03 21:02:29 +0200
commite1877577bc058cfd0b9141b250595b38e95a6ecf (patch)
tree57befbce91a25349e2de0f6d2c99f393ed1f770b /test
parent8030f5003d83fd520c4267c117e1c60d83f6bef5 (diff)
downloadmitmproxy-e1877577bc058cfd0b9141b250595b38e95a6ecf.tar.gz
mitmproxy-e1877577bc058cfd0b9141b250595b38e95a6ecf.tar.bz2
mitmproxy-e1877577bc058cfd0b9141b250595b38e95a6ecf.zip
make split_special_areas more flexible, refs #2537
(cherry picked from commit 31ef7f149e4553eb9403634c0eec6de4d0123386)
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/utils/test_strutils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/utils/test_strutils.py b/test/mitmproxy/utils/test_strutils.py
index 7ec72e4e..dfe2c620 100644
--- a/test/mitmproxy/utils/test_strutils.py
+++ b/test/mitmproxy/utils/test_strutils.py
@@ -99,8 +99,8 @@ def test_hexdump():
ESCAPE_QUOTES = [
- ("'", strutils.NO_ESCAPE + "'"),
- ('"', strutils.NO_ESCAPE + '"')
+ "'" + strutils.SINGLELINE_CONTENT + strutils.NO_ESCAPE + "'",
+ '"' + strutils.SINGLELINE_CONTENT + strutils.NO_ESCAPE + '"'
]
@@ -113,11 +113,11 @@ def test_split_special_areas():
) == ["foo ", "'b\\'a\"r'", " baz"]
assert strutils.split_special_areas(
"foo\n/*bar\nbaz*/\nqux",
- [(r'/\*', r'\*/')]
+ [r'/\*[\s\S]+?\*/']
) == ["foo\n", "/*bar\nbaz*/", "\nqux"]
assert strutils.split_special_areas(
"foo\n//bar\nbaz",
- [(r'//', r'$')]
+ [r'//.+$']
) == ["foo\n", "//bar", "\nbaz"]