Add remaining pocs for the issue 428 and adapt the regression test

Exiv2 · Sep 11, 2018 · cfc7a1c · cfc7a1c
1 parent 8b480bc
commit cfc7a1c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/test/data/issue_428_poc5.png b/test/data/issue_428_poc5.png
diff --git a/test/data/issue_428_poc6.png b/test/data/issue_428_poc6.png
diff --git a/test/data/issue_428_poc7.png b/test/data/issue_428_poc7.png
diff --git a/test/data/issue_428_poc8.png b/test/data/issue_428_poc8.png
diff --git a/tests/bugfixes/github/test_issue_428.py b/tests/bugfixes/github/test_issue_428.py
@@ -2,6 +2,10 @@
 
 import system_tests
 
+def stderr_exception (fname):
+    return """$exiv2_exception_message """ + fname + """:
+$kerFailedToReadImageData
+"""
 
 class PngReadRawProfile(metaclass=system_tests.CaseMeta):
 
@@ -12,14 +16,20 @@ class PngReadRawProfile(metaclass=system_tests.CaseMeta):
         system_tests.path("$data_path/issue_428_poc2.png"),
         system_tests.path("$data_path/issue_428_poc3.png"),
         system_tests.path("$data_path/issue_428_poc4.png"),
+        system_tests.path("$data_path/issue_428_poc5.png"),
+        system_tests.path("$data_path/issue_428_poc8.png"),
+
+        system_tests.path("$data_path/issue_428_poc6.png"),
+        system_tests.path("$data_path/issue_428_poc7.png"),
     ]
 
     commands = ["$exiv2 " + fname for fname in filenames]
     stdout = [""] * len(filenames)
-    stderr = [
-        """$exiv2_exception_message """ + fname + """:
-$kerFailedToReadImageData
-"""
-        for fname in filenames
-    ]
+    stderr = [ stderr_exception(fname) for fname in filenames[0:6] ]
+    stderr.append("""Error: XMP Toolkit error 201: XML parsing failure
+Warning: Failed to decode XMP metadata.
+""" + stderr_exception(filenames[6]))
+    stderr.append("""Warning: Failed to decode Exif metadata.
+""" + stderr_exception(filenames[7]))
+
     retval = [1] * len(filenames)