diff options
| -rw-r--r-- | tests/lib | 11 | ||||
| -rwxr-xr-x | tests/tests/debpolicy-taintrm | 3 |
2 files changed, 6 insertions, 8 deletions
@@ -181,13 +181,14 @@ t-expect-push-fail-retriably () { } t-expect-push-fail-tainted () { - # t-expect-push-fail-local-and-remote $mlocal $mremote $push_args... - # Messages are implicitly prefixed with 'E:^' + # t-expect-push-fail-local-and-remote $m $push_args... + # Message is implicitly prefixed with 'E:^' # to avoid spotting them in protocol debug output etc. - local ml="$1"; local mr="$2"; shift; shift + # Same message is expected from the remote. + local m="$1"; shift - t-expect-push-fail-retriably E:"^$ml" "$@" - t-expect-push-fail E:"^$mr" "$@" --force-push-tainted + t-expect-push-fail-retriably "E:^$m" "$@" + t-expect-push-fail "E:^remote: $m" "$@" --force-push-tainted } t-git-objects-not-present () { diff --git a/tests/tests/debpolicy-taintrm b/tests/tests/debpolicy-taintrm index 70ca165..eccc290 100755 --- a/tests/tests/debpolicy-taintrm +++ b/tests/tests/debpolicy-taintrm @@ -21,7 +21,6 @@ t-commit 'edit after first push' t-expect-push-fail-tainted \ 'Package is in NEW and has not been accepted or rejected yet' \ - 'remote: Package is in NEW and has not been accepted or rejected yet' \ t-dgit push-source --new : cut @@ -40,12 +39,10 @@ t-commit 'edit after cut' t-expect-push-fail-tainted \ 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ - 'remote: Reason:.* all previously pushed versions were found to have been removed from NEW' \ t-dgit push-source --new t-expect-push-fail-tainted \ 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ - 'remote: Reason:.* all previously pushed versions were found to have been removed from NEW' \ t-dgit push-source --new --deliberately-not-fast-forward \ --force-reusing-version |