From 579c62a666246746cd70d140b9206d318b620ea9 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 4 Jan 2020 12:06:13 -0600 Subject: [PATCH] test-meta: accommodate python 3 Signed-off-by: Rob Browning Tested-by: Rob Browning --- t/test-meta.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/t/test-meta.sh b/t/test-meta.sh index e3b79e3..f251065 100755 --- a/t/test-meta.sh +++ b/t/test-meta.sh @@ -438,10 +438,11 @@ src/foo/3" tmpdir="$(WVPASS wvmktempdir)" || exit $? + # FIXME: binary groups first_group="$(WVPASS bup-python -c 'import os,grp; \ - print grp.getgrgid(os.getgroups()[0])[0]')" || exit $? + print(grp.getgrgid(os.getgroups()[0])[0])')" || exit $? last_group="$(bup-python -c 'import os,grp; \ - print grp.getgrgid(os.getgroups()[-1])[0]')" || exit $? + print(grp.getgrgid(os.getgroups()[-1])[0])')" || exit $? last_group_erx="$(escape-erx "$last_group")" WVSTART 'metadata (restoration of ownership)' @@ -679,8 +680,8 @@ if [ "$root_status" = root ]; then WVPASS touch "$testfs"/src/bar WVPASS bup-python -c "from bup import xstat; \ x = xstat.timespec_to_nsecs((42, 0));\ - xstat.utime('$testfs/src/foo', (x, x));\ - xstat.utime('$testfs/src/bar', (x, x));" + xstat.utime(b'$testfs/src/foo', (x, x));\ + xstat.utime(b'$testfs/src/bar', (x, x));" WVPASS cd "$testfs" WVPASS bup meta -v --create --recurse --file src.meta src WVPASS bup meta -tvf src.meta @@ -741,7 +742,7 @@ if [ "$root_status" = root ]; then WVPASS cd "$testfs_limited"/src-restore WVFAIL bup meta --extract --file "$testfs"/src.meta WVFAIL bup meta --extract --file "$testfs"/src.meta 2>&1 \ - | WVPASS grep -e "^xattr\.set '" \ + | WVPASS grep -e "^xattr\.set u\?'" \ | WVPASS bup-python -c \ 'import sys; exit(not len(sys.stdin.readlines()) == 2)' ) || exit $? -- 2.39.2