get: adjust for python 3 and test there

[bup.git] / t / test-import-duplicity.sh

diff --git a/t/test-import-duplicity.sh b/t/test-import-duplicity.sh
index 61fb2fff4d0a48b3d357a6823560e475f7b11b23..74aabc69e7234fdc894f8e45e3dfc6b4a5cdea02 100755 (executable)
--- a/t/test-import-duplicity.sh
+++ b/t/test-import-duplicity.sh
@@ -16,7 +16,7 @@ bup() { "$top/bup" "$@"; }
 dup() { duplicity --archive-dir "$tmpdir/dup-cache" "$@"; }
 
 WVSTART "import-duplicity"
-WVPASS cp -a "$top/t/sampledata" "$tmpdir/src"
+WVPASS "$top/t/sync-tree" "$top/t/sampledata/" "$tmpdir/src/"
 
 export BUP_DIR="$tmpdir/bup"
 export GIT_DIR="$tmpdir/bup"
@@ -30,7 +30,7 @@ WVPASS bup tick
 WVPASS touch src/new-file
 WVPASS dup src file://duplicity
 WVPASS bup import-duplicity "file://duplicity" import-duplicity
-WVPASSEQ "$(bup ls import-duplicity/ | wc -l)" "3"
+WVPASSEQ $(bup ls import-duplicity/ | wc -l) 3
 WVPASSEQ "$(bup ls import-duplicity/latest/ | sort)" "$(ls src | sort)"
 WVPASS bup restore -C restore/ import-duplicity/latest/
 WVFAIL "$top/t/compare-trees" src/ restore/ > tmp-compare-trees