X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=t%2Ftest-import-duplicity.sh;h=74aabc69e7234fdc894f8e45e3dfc6b4a5cdea02;hb=bf67f94dd4f4096de4eee07a7dc377d6c889a016;hp=61fb2fff4d0a48b3d357a6823560e475f7b11b23;hpb=701b158eb6fcbbffcbdcc88018387341a9dfa47a;p=bup.git diff --git a/t/test-import-duplicity.sh b/t/test-import-duplicity.sh index 61fb2ff..74aabc6 100755 --- 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