[Git][reproducible-builds/diffoscope][master] tests: adjust test with one-byte text file for file-5.40

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
d5707121 by Zbigniew Jędrzejewski-Szmek at 2021-09-12T14:29:36+02:00
tests: adjust test with one-byte text file for file-5.40

Versions up to 5.39 qualify a file with 'a\n' as "text".  Version 5.40
returns "data". Apparently at least two ascii characters are needed.
This causes a test failure, because instead of 'diff', 'xxd'+'diff'
were used on the files, so the output changed to have a prefix of
"00000000: 610a", and the diff output didn't match.

To resolve this, change the text in the files to 'asdf' and 'bsdf'
respectively. (I tried to minimize changes, but the timestamps on the
contents and details of the compression are changed. But since the
point of the test is to compare diff output, and not gzip compression
details, I think this should be OK.)

- - - - -


3 changed files:

- tests/data/archive1.tar
- tests/data/archive12.diff.txt
- tests/data/archive2.tar


Changes:

=====================================
tests/data/archive1.tar
=====================================
Binary files a/tests/data/archive1.tar and b/tests/data/archive1.tar differ


=====================================
tests/data/archive12.diff.txt
=====================================
@@ -2,14 +2,14 @@
 +++ archive2.tar
 ├── file list
 │ @@ -1 +1 @@
-│ --rw-r--r--   0 lamby     (1000) lamby     (1000)       22 2017-03-19 22:26:58.000000 compressed.gz
-│ +-rw-r--r--   0 lamby     (1000) lamby     (1000)       33 2017-03-19 22:27:42.000000 compressed.gz
+│ --rw-r--r--   0 lamby     (1000) lamby     (1000)       25 2021-09-12 11:53:14.000000 compressed.gz
+│ +-rw-r--r--   0 lamby     (1000) lamby     (1000)       36 2021-09-12 11:59:26.000000 compressed.gz
 ├── compressed.gz
 │ ├── filetype from file(1)
 │ │ @@ -1 +1 @@
-│ │ -gzip compressed data, max compression, from Unix, truncated
-│ │ +gzip compressed data, was "compressed", last modified: Sun Mar 19 22:27:42 2017, max compression, from Unix, truncated
+│ │ -gzip compressed data, last modified: Sun Mar 19 22:26:58 2017, from Unix, truncated
+│ │ +gzip compressed data, was "compressed", last modified: Sun Sep 12 11:59:26 2021, max compression, from Unix, truncated
 │ ├── compressed
 │ │ @@ -1 +1 @@
-│ │ -a
-│ │ +b
+│ │ -asdf
+│ │ +bsdf


=====================================
tests/data/archive2.tar
=====================================
Binary files a/tests/data/archive2.tar and b/tests/data/archive2.tar differ



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/d5707121e6a967377c1e5aaae78037c24df73be7
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/20210912/c9eee287/attachment.htm>