cirrus: allow failures on macos with python 2

[bup.git] / t / test-ls

diff --git a/t/test-ls b/t/test-ls
index 2b919a211958318f416ce8be1f830b8ae20e3e48..23e15d79adad076e868a6f0ca701ca2375e2c807 100755 (executable)
--- a/t/test-ls
+++ b/t/test-ls
@@ -51,10 +51,10 @@ WVPASS bup save -n src -d 242312160 --strip src
 WVPASS bup tag some-tag src
 
 uid="$(WVPASS id -u)" || exit $?
-gid="$(WVPASS bup-python -c 'import os; print os.stat("src").st_gid')" || exit $?
+gid="$(WVPASS bup-cfg-py -c 'import os; print(os.stat("src").st_gid)')" || exit $?
 user="$(WVPASS id -un)" || exit $?
-group="$(WVPASS bup-python -c 'import grp, os;
-print grp.getgrgid(os.stat("src").st_gid)[0]')" || exit $?
+group="$(WVPASS bup-cfg-py -c 'import grp, os;
+print(grp.getgrgid(os.stat("src").st_gid)[0])')" || exit $?
 src_commit_hash=$(git log --format=%H -n1 src)
 src_tree_hash=$(git log --format=%T -n1 src)
 
@@ -136,23 +136,23 @@ WVPASSEQ "$(WVPASS bup-ls -l / | tr -s ' ' ' ')" \
 "drwx------ $user/$group 0 2009-10-03 23:48 src"
 
 WVPASSEQ "$(WVPASS bup-ls -lA / | tr -s ' ' ' ')" \
-"drwxr-xr-x 0/0 0 1970-01-01 00:00 .tag
+"drwxr-xr-x ?/? 0 1970-01-01 00:00 .tag
 drwx------ $user/$group 0 2009-10-03 23:48 src"
 
 WVPASSEQ "$(WVPASS bup-ls -lAF / | tr -s ' ' ' ')" \
-"drwxr-xr-x 0/0 0 1970-01-01 00:00 .tag/
+"drwxr-xr-x ?/? 0 1970-01-01 00:00 .tag/
 drwx------ $user/$group 0 2009-10-03 23:48 src/"
 
 WVPASSEQ "$(WVPASS bup-ls -la / | tr -s ' ' ' ')" \
-"drwxr-xr-x 0/0 0 1970-01-01 00:00 .
-drwxr-xr-x 0/0 0 1970-01-01 00:00 ..
-drwxr-xr-x 0/0 0 1970-01-01 00:00 .tag
+"drwxr-xr-x ?/? 0 1970-01-01 00:00 .
+drwxr-xr-x ?/? 0 1970-01-01 00:00 ..
+drwxr-xr-x ?/? 0 1970-01-01 00:00 .tag
 drwx------ $user/$group 0 2009-10-03 23:48 src"
 
 WVPASSEQ "$(WVPASS bup-ls -laF / | tr -s ' ' ' ')" \
-"drwxr-xr-x 0/0 0 1970-01-01 00:00 ./
-drwxr-xr-x 0/0 0 1970-01-01 00:00 ../
-drwxr-xr-x 0/0 0 1970-01-01 00:00 .tag/
+"drwxr-xr-x ?/? 0 1970-01-01 00:00 ./
+drwxr-xr-x ?/? 0 1970-01-01 00:00 ../
+drwxr-xr-x ?/? 0 1970-01-01 00:00 .tag/
 drwx------ $user/$group 0 2009-10-03 23:48 src/"
 
 socket_mode="$(WVPASS ls -l src/socket | cut -b -10)" || exit $?
@@ -169,8 +169,8 @@ bad_symlink_date="$(WVPASS echo "$bad_symlink_bup_info" \
 test "$bad_symlink_date" || exit 1
 
 if test "$(uname -s)" != NetBSD; then
-    bad_symlink_size="$(WVPASS bup-python -c "import os
-print os.lstat('src/bad-symlink').st_size")" || exit $?
+    bad_symlink_size="$(WVPASS bup-cfg-py -c "import os
+print(os.lstat('src/bad-symlink').st_size)")" || exit $?
 else
     # NetBSD appears to return varying sizes, so for now, just ignore it.
     bad_symlink_size="$(WVPASS echo "$bad_symlink_bup_info" \
@@ -190,8 +190,8 @@ symlink_date="$(WVPASS echo "$symlink_bup_info" \
 test "$symlink_date" || exit 1
 
 if test "$(uname -s)" != NetBSD; then
-    symlink_size="$(WVPASS bup-python -c "import os
-print os.lstat('src/symlink').st_size")" || exit $?
+    symlink_size="$(WVPASS bup-cfg-py -c "import os
+print(os.lstat('src/symlink').st_size)")" || exit $?
 else
     # NetBSD appears to return varying sizes, so for now, just ignore it.
     symlink_size="$(WVPASS echo "$symlink_bup_info" \
@@ -252,14 +252,14 @@ $socket_mode $uid/$gid 0 2009-10-03 23:48 socket
 $symlink_mode $uid/$gid $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup-ls -ld "src/latest" | tr -s ' ' ' ')" \
-"lrwxr-xr-x 0/0 17 1970-01-01 00:00 src/latest -> 1977-09-05-125600"
+"lrwxr-xr-x ?/? 17 1970-01-01 00:00 src/latest -> 1977-09-05-125600"
 
 
 WVSTART "$ls_cmd_desc (backup set - long)"
 WVPASSEQ "$(bup-ls -l --numeric-ids src | cut -d' ' -f 1-2)" \
 "drwx------ $uid/$gid
 drwx------ $uid/$gid
-lrwxr-xr-x 0/0"
+lrwxr-xr-x ?/?"
 
 WVPASSEQ "$(bup-ls -ds "src/1977-09-05-125600" | tr -s ' ' ' ')" \
 "$src_tree_hash src/1977-09-05-125600"