[diffoscope] 01/06: Add ".in" suffix to squashfs listing expected diff as we are about to template it properly.

Chris Lamb chris at chris-lamb.co.uk
Sun Aug 14 11:31:50 CEST 2016


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

lamby pushed a commit to branch master
in repository diffoscope.

commit 77aa5566afcc70d2f8e94b8d74640259d6c05f7d
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 14 10:01:16 2016 +0100

    Add ".in" suffix to squashfs listing expected diff as we are about to template it properly.
---
 tests/comparators/test_squashfs.py                                      | 2 +-
 ...squashfs_listing_expected_diff => squashfs_listing_expected_diff.in} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py
index 742e51a..c80b059 100644
--- a/tests/comparators/test_squashfs.py
+++ b/tests/comparators/test_squashfs.py
@@ -61,7 +61,7 @@ def test_superblock(differences):
 @pytest.mark.skipif(try_except(lambda: 1000 not in {x.pw_uid for x in pwd.getpwall()}, True, KeyError), reason="No uid 1000")
 @pytest.mark.skipif(tool_missing('unsquashfs'), reason='missing unsquashfs')
 def test_listing(differences):
-    expected_diff = open(os.path.join(os.path.dirname(__file__), '../data/squashfs_listing_expected_diff')).read()
+    expected_diff = open(os.path.join(os.path.dirname(__file__), '../data/squashfs_listing_expected_diff.in')).read()
     # Workaround #794096
     expected_diff = expected_diff.replace('lunar/lunar', '{user}/{user}'.format(
         user=pwd.getpwuid(1000).pw_name,
diff --git a/tests/data/squashfs_listing_expected_diff b/tests/data/squashfs_listing_expected_diff.in
similarity index 100%
rename from tests/data/squashfs_listing_expected_diff
rename to tests/data/squashfs_listing_expected_diff.in

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


More information about the diffoscope mailing list