Restore ls -l item sizes, and add initial tests for them.

Thanks to Karl Kiniger <karl.kiniger@med.ge.com> for the report.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/ls.py b/lib/bup/ls.py
index 66e421d40c254b33744aa4f85f91a26418c84753..444694aa6d40d007d16b43bf1cdfed271f0f3a6b 100644 (file)
--- a/lib/bup/ls.py
+++ b/lib/bup/ls.py
@@ -19,6 +19,7 @@ def node_info(n, name,
         meta = copy.copy(n.metadata())
         if meta:
             meta.path = name
+            meta.size = n.size()
         else:
             # Fake it -- summary_str() is designed to handle a fake.
             meta = metadata.Metadata()

diff --git a/t/test-ls.sh b/t/test-ls.sh
index db5772a0d23bf84b7a793d8c10c41cb484d53ff2..506f30818e781b4ec776d8364ff56879f0a18f2b 100755 (executable)
--- a/t/test-ls.sh
+++ b/t/test-ls.sh
@@ -17,6 +17,7 @@ WVPASS cd "$tmpdir"
 WVPASS mkdir src
 WVPASS touch -t 191111111111 src/.dotfile
 WVPASS date > src/file
+WVPASS bup random 1k > src/file
 WVPASS touch -t 191111111111 src/file
 (WVPASS cd src; WVPASS ln -s file symlink) || exit $?
 WVPASS mkfifo src/fifo
@@ -119,9 +120,10 @@ d--------- ?/? - 1969-12-31 18:00 .commit/
 d--------- ?/? - 1969-12-31 18:00 .tag/
 d--------- ?/? - 1969-12-31 18:00 src/"
 
+symlink_size="$(python -c "import os; print os.lstat('src/symlink').st_size")"
 symlink_date="$(bup ls -l src/latest"$tmpdir"/src | grep symlink)"
 symlink_date="$(echo "$symlink_date" \
-  | perl -ne 'm/.*? - (\d\d\d\d-\d\d-\d\d \d\d:\d\d)/ and print $1')"
+  | perl -ne 'm/.*? (\d+) (\d\d\d\d-\d\d-\d\d \d\d:\d\d)/ and print $2')"
 uid="$(id -u)" || exit $?
 gid="$(id -g)" || exit $?
 user="$(id -un)" || exit $?
@@ -130,9 +132,9 @@ group="$(id -gn)" || exit $?
 WVPASSEQ "$(bup ls -l src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "-rwx------ $user/$group - 1911-11-11 11:11 executable
 prw------- $user/$group - 1911-11-11 11:11 fifo
--rw------- $user/$group - 1911-11-11 11:11 file
+-rw------- $user/$group 1024 1911-11-11 11:11 file
 srwx------ $user/$group - 1911-11-11 11:11 socket
-lrwxrwxrwx $user/$group - $symlink_date symlink -> file"
+lrwxrwxrwx $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -la src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "drwx------ $user/$group - 1911-11-11 11:11 .
@@ -140,38 +142,38 @@ drwx------ $user/$group - 1911-11-11 11:11 ..
 -rw------- $user/$group - 1911-11-11 11:11 .dotfile
 -rwx------ $user/$group - 1911-11-11 11:11 executable
 prw------- $user/$group - 1911-11-11 11:11 fifo
--rw------- $user/$group - 1911-11-11 11:11 file
+-rw------- $user/$group 1024 1911-11-11 11:11 file
 srwx------ $user/$group - 1911-11-11 11:11 socket
-lrwxrwxrwx $user/$group - $symlink_date symlink -> file"
+lrwxrwxrwx $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -lA src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "-rw------- $user/$group - 1911-11-11 11:11 .dotfile
 -rwx------ $user/$group - 1911-11-11 11:11 executable
 prw------- $user/$group - 1911-11-11 11:11 fifo
--rw------- $user/$group - 1911-11-11 11:11 file
+-rw------- $user/$group 1024 1911-11-11 11:11 file
 srwx------ $user/$group - 1911-11-11 11:11 socket
-lrwxrwxrwx $user/$group - $symlink_date symlink -> file"
+lrwxrwxrwx $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -lF src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "-rwx------ $user/$group - 1911-11-11 11:11 executable*
 prw------- $user/$group - 1911-11-11 11:11 fifo|
--rw------- $user/$group - 1911-11-11 11:11 file
+-rw------- $user/$group 1024 1911-11-11 11:11 file
 srwx------ $user/$group - 1911-11-11 11:11 socket=
-lrwxrwxrwx $user/$group - $symlink_date symlink@ -> file"
+lrwxrwxrwx $user/$group $symlink_size $symlink_date symlink@ -> file"
 
 WVPASSEQ "$(bup ls -l --file-type src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "-rwx------ $user/$group - 1911-11-11 11:11 executable
 prw------- $user/$group - 1911-11-11 11:11 fifo|
--rw------- $user/$group - 1911-11-11 11:11 file
+-rw------- $user/$group 1024 1911-11-11 11:11 file
 srwx------ $user/$group - 1911-11-11 11:11 socket=
-lrwxrwxrwx $user/$group - $symlink_date symlink@ -> file"
+lrwxrwxrwx $user/$group $symlink_size $symlink_date symlink@ -> file"
 
 WVPASSEQ "$(bup ls -ln src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
 "-rwx------ $uid/$gid - 1911-11-11 11:11 executable
 prw------- $uid/$gid - 1911-11-11 11:11 fifo
--rw------- $uid/$gid - 1911-11-11 11:11 file
+-rw------- $uid/$gid 1024 1911-11-11 11:11 file
 srwx------ $uid/$gid - 1911-11-11 11:11 socket
-lrwxrwxrwx $uid/$gid - $symlink_date symlink -> file"
+lrwxrwxrwx $uid/$gid $symlink_size $symlink_date symlink -> file"
 
 WVSTART "ls (backup set - long)"
 WVPASSEQ "$(bup ls -l src | cut -d' ' -f 1-2)" \