test-restore-map-owner: accommodate python 3 and test there

[bup.git] / t / test-rm.sh

diff --git a/t/test-rm.sh b/t/test-rm.sh
index e0c9b5307da380dfc3684665c654a4aa480ffb74..00a5a8579ebef4fc639fdaecd69de71381e8c93f 100755 (executable)
--- a/t/test-rm.sh
+++ b/t/test-rm.sh
@@ -27,7 +27,7 @@ wv_matches_rx()
     echo "$str" | sed 's/^\(.*\)/  \1/' 1>&2 || exit $?
     echo "Against:" 1>&2 || exit $?
     echo "$rx" | sed 's/^\(.*\)/  \1/' 1>&2 || exit $?
-    if [[ "$str" =~ $rx ]]; then
+    if [[ "$str" =~ ^${rx}$ ]]; then
         echo "! $src regex matches ok" 1>&2 || exit $?
     else
         echo "! $src regex doesn't match FAILED" 1>&2 || exit $?
@@ -51,9 +51,11 @@ WVPASS bup rm --unsafe /src
 observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 '\*deleting[ ]+logs/refs/heads/src
-\*deleting[ ]+refs/heads/src
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/'
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?'
 
 
 WVSTART "rm /foo (one of many)"
@@ -71,9 +73,11 @@ WVPASS bup rm --unsafe /src
 observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
-\*deleting[ ]+refs/heads/src
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (multiple of many)"
@@ -93,9 +97,11 @@ wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src-2
 \*deleting[ ]+logs/refs/heads/src-4
 \*deleting[ ]+refs/heads/src-2
-\*deleting[ ]+refs/heads/src-4
+\*deleting[ ]+refs/heads/src-4(
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (all)"
@@ -115,9 +121,11 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+refs/heads/src-2
 \*deleting[ ]+refs/heads/src-3
 \*deleting[ ]+refs/heads/src-4
-\*deleting[ ]+refs/heads/src-5
+\*deleting[ ]+refs/heads/src-5(
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo/bar (lone save - equivalent to rm /foo)"
@@ -136,9 +144,11 @@ WVPASS bup rm --unsafe /src/"$save1"
 observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
-\*deleting[ ]+refs/heads/src
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 verify-changes-caused-by-rewriting-save()