Merge pull request #2411 from ujjwal96/ico-parser

ICO content view

2 files changed, 24 insertions, 2 deletions

diff --git a/test/mitmproxy/contentviews/image/test_image_parser.py b/test/mitmproxy/contentviews/image/test_image_parser.py
index 3cb44ca6..fdc72165 100644
--- a/test/mitmproxy/contentviews/image/test_image_parser.py
+++ b/test/mitmproxy/contentviews/image/test_image_parser.py
@@ -167,3 +167,26 @@ def test_parse_gif(filename, metadata):
 def test_parse_jpeg(filename, metadata):
     with open(tutils.test_data.path(filename), 'rb') as f:
         assert metadata == image_parser.parse_jpeg(f.read())
+
+
+@pytest.mark.parametrize("filename, metadata", {
+    "mitmproxy/data/image.ico": [
+        ('Format', 'ICO'),
+        ('Number of images', '3'),
+        ('Image 1', "Size: {} x {}\n"
+                    "{: >18}Bits per pixel: {}\n"
+                    "{: >18}PNG: {}".format(48, 48, '', 24, '', False)
+         ),
+        ('Image 2', "Size: {} x {}\n"
+                    "{: >18}Bits per pixel: {}\n"
+                    "{: >18}PNG: {}".format(32, 32, '', 24, '', False)
+         ),
+        ('Image 3', "Size: {} x {}\n"
+                    "{: >18}Bits per pixel: {}\n"
+                    "{: >18}PNG: {}".format(16, 16, '', 24, '', False)
+         )
+    ]
+}.items())
+def test_ico(filename, metadata):
+    with open(tutils.test_data.path(filename), 'rb') as f:
+        assert metadata == image_parser.parse_ico(f.read())
diff --git a/test/mitmproxy/contentviews/image/test_view.py b/test/mitmproxy/contentviews/image/test_view.py
index 34f655a1..6da5b1d0 100644
--- a/test/mitmproxy/contentviews/image/test_view.py
+++ b/test/mitmproxy/contentviews/image/test_view.py
@@ -9,8 +9,7 @@ def test_view_image():
         "mitmproxy/data/image.png",
         "mitmproxy/data/image.gif",
         "mitmproxy/data/all.jpeg",
-        # https://bugs.python.org/issue21574
-        # "mitmproxy/data/image.ico",
+        "mitmproxy/data/image.ico",
     ]:
         with open(tutils.test_data.path(img), "rb") as f:
             viewname, lines = v(f.read())