[diffoscope] branch master updated (70cb725 -> 0de6c1a)

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a change to branch master
in repository diffoscope.

      from  70cb725   Don't crash on malformed md5sums files. (Closes: #877473)
       new  ae3f2f0   comparators/utils/file: diff container metadata centrally here. (Closes: #797759)
       new  0de6c1a   comparators/utils/file: fix the rest of the tests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 diffoscope/comparators/elf.py                      |   2 +
 diffoscope/comparators/gzip.py                     |   3 -
 diffoscope/comparators/squashfs.py                 |   2 +
 diffoscope/comparators/utils/container.py          |   2 +
 diffoscope/comparators/utils/file.py               |   7 ++
 tests/comparators/test_apk.py                      |   6 +-
 tests/comparators/test_containers.py               |  98 +++++++--------------
 tests/comparators/test_gzip.py                     |   4 +-
 tests/comparators/test_ipk.py                      |   2 +-
 tests/data/archive12.diff.txt                      |   2 +-
 tests/data/containers/b.tar.gz                     | Bin 532 -> 532 bytes
 ...bzip2_xz_diff => different_files_expected_diff} |   0
 .../different_files_expected_gzip_bzip2_diff       |  45 ----------
 .../different_files_expected_gzip_bzip2_meta       |   3 -
 .../different_files_expected_gzip_xz_diff          |  45 ----------
 .../different_files_expected_gzip_xz_meta          |   3 -
 .../containers/equal_files_expected_bzip_xz_diff   |   3 -
 .../equal_files_expected_gzip_bzip2_diff           |   3 -
 tests/data/containers/magic_bzip2                  |   1 +
 tests/data/containers/magic_gzip                   |   1 +
 tests/data/containers/magic_xz                     |   1 +
 21 files changed, 54 insertions(+), 179 deletions(-)
 rename tests/data/containers/{different_files_expected_bzip2_xz_diff => different_files_expected_diff} (100%)
 delete mode 100644 tests/data/containers/different_files_expected_gzip_bzip2_diff
 delete mode 100644 tests/data/containers/different_files_expected_gzip_bzip2_meta
 delete mode 100644 tests/data/containers/different_files_expected_gzip_xz_diff
 delete mode 100644 tests/data/containers/different_files_expected_gzip_xz_meta
 delete mode 100644 tests/data/containers/equal_files_expected_bzip_xz_diff
 delete mode 100644 tests/data/containers/equal_files_expected_gzip_bzip2_diff
 create mode 100644 tests/data/containers/magic_bzip2
 create mode 100644 tests/data/containers/magic_gzip
 create mode 100644 tests/data/containers/magic_xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git