Your message dated Sun, 20 May 2018 16:35:40 +0000
with message-id <[email protected]>
and subject line Bug#872826: fixed in diffoscope 95
has caused the Debian Bug report #872826,
regarding Diffoscope: difference of "Device ID" caused an error in test suite
on FreeBSD
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
872826: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872826
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: diffoscope
Version: 85
Severity: normal
X-Debbugs-CC: [email protected]
A test case failed on FreeBSD because of the different Device ID between two
system.
A commit regarding a similar issue:
https://anonscm.debian.org/git/reproducible/diffoscope.git/commit/?id=1390b76
A proposed patch is attached. Thank you!
--
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git
diff --git a/tests/comparators/test_git.py b/tests/comparators/test_git.py
index c2b1247..d32e4ce 100644
--- a/tests/comparators/test_git.py
+++ b/tests/comparators/test_git.py
@@ -17,6 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
+import os
import pytest
from diffoscope.comparators.git import GitIndexFile
@@ -38,5 +39,8 @@ def differences(git1, git2):
return git1.compare(git2).details
def test_diff(differences):
- expected_diff = get_data('git_expected_diff')
+ if os.uname()[0] == 'FreeBSD':
+ expected_diff = get_data('git_expected_diff_freebsd')
+ else:
+ expected_diff = get_data('git_expected_diff')
assert differences[0].unified_diff == expected_diff
diff --git a/tests/data/git_expected_diff_freebsd
b/tests/data/git_expected_diff_freebsd
new file mode 100644
index 0000000..f357a2d
--- /dev/null
+++ b/tests/data/git_expected_diff_freebsd
@@ -0,0 +1,19 @@
+@@ -10,7 +10,18 @@
+ User ID: 1000
+ Group ID: 1000
+ Created: 1471689380.154572964
+ Modified: 1471689380.154572964
+ Inode: 52205983
+ Device ID: (0, 2054)
+
++Path: b'b'
++SHA: e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
++Size: 0
++Flags: 0b1
++User ID: 1000
++Group ID: 1000
++Created: 1471689417.184218147
++Modified: 1471689417.184218147
++Inode: 52206041
++Device ID: (0, 2054)
++
--- End Message ---
--- Begin Message ---
Source: diffoscope
Source-Version: 95
We believe that the bug you reported is fixed in the latest version of
diffoscope, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mattia Rizzolo <[email protected]> (supplier of updated diffoscope package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 20 May 2018 17:46:57 +0200
Source: diffoscope
Binary: diffoscope
Architecture: source
Version: 95
Distribution: unstable
Urgency: medium
Maintainer: Reproducible builds folks
<[email protected]>
Changed-By: Mattia Rizzolo <[email protected]>
Description:
diffoscope - in-depth comparison of files, archives, and directories
Closes: 872826 898022 898683
Changes:
diffoscope (95) unstable; urgency=medium
.
[ Mattia Rizzolo ]
* tests:
+ test_binary: Don't capture unused output from subprocess.
+ test_git: Fix test failure on FreeBSD. Closes: #872826
Thanks to Ximin Luo <[email protected]> for the initial patch
* Fix handling of filesnames with non-unicode chars. Closes: #898022
* diff: Use bytes as much as possible, to prevent possible encoding issues.
* d/control: Make the dependency on python3-distutils an alternative on the
previous versions of libpython3.*-stdlib that used to ship it.
Closes: #898683
* d/watch: Update URL to the new archive.
.
[ Chris Lamb ]
* The Git repository has been migrated to salsa, update all the references.
* Drop extra whitespace in supported file format output.
Checksums-Sha1:
782c2ae2fd11e557de59a3b369077879c40d6785 3448 diffoscope_95.dsc
6b3e0c05cfb94459de1169ae612bdcdf36bad6a4 9244552 diffoscope_95.tar.xz
cec82d83e5852e0434b4510836b184b5fd285bd5 21700 diffoscope_95_amd64.buildinfo
Checksums-Sha256:
1def6a6a0dc17e0291886eee6249597c685027b05ab48af6cc412c6ab192d95f 3448
diffoscope_95.dsc
7991d7680d56315e99efa284cb278915b74f3646e2ae10fc10389c318cf7711c 9244552
diffoscope_95.tar.xz
9323e37a2cbc9cc14b0f0dd4deaa79c29cddfe9612d70ae5016a34a16319af78 21700
diffoscope_95_amd64.buildinfo
Files:
d2e620a8779cbed99cb1c6444163e100 3448 devel optional diffoscope_95.dsc
d8068a84700c902dd7cc2c5fb6f9e8bc 9244552 devel optional diffoscope_95.tar.xz
1f42fe134ee41e3857354614e860ddf4 21700 devel optional
diffoscope_95_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEi3hoeGwz5cZMTQpICBa54Yx2K60FAlsBmnMACgkQCBa54Yx2
K62qeQ/+OFubz/aQeKo0zkDAWaOSXAHbTCJdz6LE13KB6qHrMQl9G4+s5wpG2DDb
t6DMiHKvQcg4rVSuSvFWIhyIt17Y2wgShLTT4VgN0KHldNjB9s7T9xQHQScNG++o
9HM2OzprRmgR2P+1E+blnJNHtEEt/TxsCmBYgOrdqq7ACrAFmoRPQWI8nZK0qO3B
o2VRl4v/GQNagXiTHbHn/63pQXCrK9ZQ0WV+U0BDSaYYa98NpIk5PebvyPi+Itsc
QbCkFxFUq07lJQlFqlL+LJUFeg0EnLzkMSRxCfp13rvusFvgAe3HBxQiv4hlTJpF
x9gL9tdNB1UiDIbPn7z5vxHS+FDrBDm7D2hXSYjdOmSbszk79yrDxjLllRAijGoZ
DH07LZmF+G9U1S74IzLt4e7fmAQb5BzX6/Gjvkv9UVbhbNrdn2CjEz7baAL8wAh7
kgCabsBmjkqnSK5iTj+0MCbpc8CZVNdF5hZRx4XlE5pv/yIKws9kF0gscit7m4Ln
FHZdDONf8qTzrq8vYqbVS+RP5KAlE2K6mwP8+qKY9g5vZaZOPVQ9wlT88Wi7YYrG
fLeVHCtfjCxO8ecCE6WLu9/0cmvVSECAYjghhYmDpiMpzyAh5/VyRXop9dm4mCI3
abBQ2dXIvImnLNKx8axAofajeGLzzZP7cgj0TJzaBufKg21SKY0=
=DK1/
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Reproducible-builds mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds
