[diffoscope] 02/06: Replace $USER with the current user with uid 1000.

[Chris Lamb]

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

lamby pushed a commit to branch master
in repository diffoscope.

commit 33ed7f0fdd7355dfc05fa08a28c44657bd64c650
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 14 10:01:54 2016 +0100

    Replace $USER with the current user with uid 1000.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 tests/comparators/test_squashfs.py           |  6 +++---
 tests/data/squashfs_listing_expected_diff.in | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/comparators/test_squashfs.py b/tests/comparators/test_squashfs.py
index c80b059..970a5a1 100644
--- a/tests/comparators/test_squashfs.py
+++ b/tests/comparators/test_squashfs.py
@@ -63,9 +63,9 @@ def test_superblock(differences):
 def test_listing(differences):
     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,
-    ))
+    expected_diff = expected_diff.replace(
+        '$USER', pwd.getpwuid(1000).pw_name,
+    )
     assert differences[1].unified_diff == expected_diff
 
 @pytest.mark.skipif(tool_missing('unsquashfs'), reason='missing unsquashfs')
diff --git a/tests/data/squashfs_listing_expected_diff.in b/tests/data/squashfs_listing_expected_diff.in
index 06dac4a..c9eac5b 100644
--- a/tests/data/squashfs_listing_expected_diff.in
+++ b/tests/data/squashfs_listing_expected_diff.in
@@ -2,10 +2,10 @@
  Parallel unsquashfs: Using 4 processors
  3 inodes (3 blocks) to write
  
--drwxr-xr-x lunar/lunar              51 2015-06-24 14:47 
--lrwxrwxrwx lunar/lunar               6 2015-06-24 14:47 /link -> broken
-+drwxr-xr-x lunar/lunar              51 2015-06-24 14:50 
-+lrwxrwxrwx lunar/lunar              13 2015-06-24 14:50 /link -> really-broken
+-drwxr-xr-x $USER/$USER              51 2015-06-24 14:47 
+-lrwxrwxrwx $USER/$USER               6 2015-06-24 14:47 /link -> broken
++drwxr-xr-x $USER/$USER              51 2015-06-24 14:50 
++lrwxrwxrwx $USER/$USER              13 2015-06-24 14:50 /link -> really-broken
  crw-r--r-- root/root             1,  3 2015-06-24 14:47 /null
---rw-r--r-- lunar/lunar             446 2015-06-24 14:49 /text
-+-rw-r--r-- lunar/lunar             671 2015-06-24 14:49 /text
+--rw-r--r-- $USER/$USER             446 2015-06-24 14:49 /text
++-rw-r--r-- $USER/$USER             671 2015-06-24 14:49 /text

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