diffoscope/comparators/zip.py

@@ -41,20 +41,23 @@ class Zipinfo(Command):
     # which are safe to ignore.
     VALID_RETURNCODES = {0, 1, 2}
 
+    re_strip_path = re.compile(r'^(warning|error) \[[^\]]+\]:\s+(.*)$')
+
     @tool_required('zipinfo')
     def cmdline(self):
-        # zipinfo (without -v) puts warning messages (some of which contain
-        # $path) into stdin when stderr is not a tty, see #879011 for details.
-        # to work around it, we run it on /dev/stdin instead, seems to work ok.
-        return ['zipinfo', '/dev/stdin']
-
-    def stdin(self):
-        return open(self.path, 'rb')
+        return ['zipinfo', self.path]
 
     def filter(self, line):
         # we don't care about the archive file path
         if line.startswith(b'Archive:'):
             return b''
+
+        # Strip paths from errors and warnings
+        # eg: "warning [/full/path]: 472 extra bytes at beginning or within zipfile"
+        m = self.re_strip_path.match(line.decode('utf-8'))
+        if m is not None:
+            return '{}: {}\n'.format(m.group(1), m.group(2)).encode('utf-8')
+
         return line
 
 

tests/comparators/test_apk.py

@@ -66,8 +66,8 @@ def test_compare_non_existing(monkeypatch, apk1):
 
 @skip_unless_tools_exist('apktool', 'zipinfo')
 def test_zipinfo(differences):
-    assert differences[0].source1 == 'zipinfo /dev/stdin'
-    assert differences[0].source2 == 'zipinfo /dev/stdin'
+    assert differences[0].source1 == 'zipinfo {}'
+    assert differences[0].source2 == 'zipinfo {}'
     expected_diff = get_data('apk_zipinfo_expected_diff')
     assert differences[0].unified_diff == expected_diff
 

tests/comparators/test_zip.py

@@ -100,12 +100,7 @@ def mozzip_differences(mozzip1, mozzip2):
 @skip_unless_tools_exist('zipinfo')
 def test_mozzip_metadata(mozzip_differences, mozzip1, mozzip2):
     expected_diff = get_data('mozzip_zipinfo_expected_diff')
-    diff = mozzip_differences[0].unified_diff
-    assert (
-        diff.replace(mozzip1.path, 'test1.mozzip').replace(
-            mozzip2.path, 'test2.mozzip'
-        )
-    ) == expected_diff
+    assert mozzip_differences[0].unified_diff == expected_diff
 
 
 @skip_unless_tools_exist('zipinfo')
@@ -138,7 +133,6 @@ def jmod_differences(jmod1, jmod2):
 @skip_unless_tools_exist('zipinfo')
 def test_jmod_metadata(jmod_differences, jmod1, jmod2):
     expected_diff = get_data('jmod_zipinfo_expected_diff')
-    diff = jmod_differences[0].unified_diff
     assert jmod_differences[0].unified_diff == expected_diff
 
 

tests/data/jmod_zipinfo_expected_diff

 @@ -1,8 +1,11 @@
 -Zip file size: 9857 bytes, number of entries: 4
 +Zip file size: 11672 bytes, number of entries: 7
- warning [/dev/stdin]:  4 extra bytes at beginning or within zipfile
+ warning: 4 extra bytes at beginning or within zipfile
    (attempting to process anyway)
 --rw----     2.0 fat      680 bl defN 19-Jul-17 04:54 classes/module-info.class
 +-rw----     2.0 fat      263 bl defN 19-Jul-17 04:54 classes/module-info.class

tests/data/mozzip_zipinfo_expected_diff

 @@ -1,8 +1,8 @@
 -Zip file size: 409 bytes, number of entries: 1
--warning [/dev/stdin]:  329 extra bytes at beginning or within zipfile
+-warning: 329 extra bytes at beginning or within zipfile
 +Zip file size: 552 bytes, number of entries: 1
-+warning [/dev/stdin]:  472 extra bytes at beginning or within zipfile
++warning: 472 extra bytes at beginning or within zipfile
    (attempting to process anyway)
- error [/dev/stdin]:  reported length of central directory is
+ error: reported length of central directory is
 -  -329 bytes too long (Atari STZip zipfile?  J.H.Holm ZIPSPLIT 1.1
 +  -472 bytes too long (Atari STZip zipfile?  J.H.Holm ZIPSPLIT 1.1
    zipfile?).  Compensating...