[Git][reproducible-builds/diffoscope][master] Apply patch from László Böszörményi to update the squashfs test output and...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
3ced4df0 by Chris Lamb at 2019-08-25T09:38:39Z
Apply patch from László Böszörményi to update the squashfs test output and additionally bump the required version for the test itself. (Closes: reproducible-builds/diffoscope#62, Debian:#935684)

- - - - -


2 changed files:

- tests/comparators/test_squashfs.py
- tests/data/squashfs_superblock_expected_diff


Changes:

=====================================
tests/comparators/test_squashfs.py
=====================================
@@ -61,7 +61,7 @@ def differences(squashfs1, squashfs2):
     return squashfs1.compare(squashfs2).details
 
 
- at skip_unless_tool_is_at_least('unsquashfs', unsquashfs_version, '4.3')
+ at skip_unless_tool_is_at_least('unsquashfs', unsquashfs_version, '4.3+git190823')
 def test_superblock(differences):
     expected_diff = get_data('squashfs_superblock_expected_diff')
     assert differences[0].unified_diff == expected_diff


=====================================
tests/data/squashfs_superblock_expected_diff
=====================================
@@ -1,13 +1,13 @@
 @@ -1,10 +1,10 @@
  Found a valid SQUASHFS 4:0 superblock
 -Creation or last append time Wed Jun 24 14:49:50 2015
--Filesystem size 0.55 Kbytes (0.00 Mbytes)
+-Filesystem size 561 bytes (0.55 Kbytes / 0.00 Mbytes)
 +Creation or last append time Wed Jun 24 14:50:09 2015
-+Filesystem size 0.70 Kbytes (0.00 Mbytes)
++Filesystem size 712 bytes (0.70 Kbytes / 0.00 Mbytes)
  Compression gzip
  Block size 131072
  Filesystem is exportable via NFS
  Inodes are compressed
  Data is compressed
+ Uids/Gids (Id table) are compressed
  Fragments are compressed
- Always-use-fragments option is not specified



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/3ced4df00178299c3d2dd527b029446fb15bf393

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/3ced4df00178299c3d2dd527b029446fb15bf393
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190825/6e23805a/attachment.html>