chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of "my $_", which is not portable
[dgit.git]
/
tests
/
tests
/
trustingpolicy-replay
diff --git
a/tests/tests/trustingpolicy-replay
b/tests/tests/trustingpolicy-replay
index 4fc3c175bb5383faa81ad29836d13fb757ae2695..e0bf334beac8e4b75af47293db0f1e5f215986ad 100755
(executable)
--- a/
tests/tests/trustingpolicy-replay
+++ b/
tests/tests/trustingpolicy-replay
@@
-26,7
+26,7
@@
t-dgit push --deliberately-fresh-repo
remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
-t-expect-fail 'Replay of previously-rewound upload' \
+t-expect-
push-
fail 'Replay of previously-rewound upload' \
git push "$remote" \
debian/1.1 \
debian/1.1~0:refs/dgit/sid
git push "$remote" \
debian/1.1 \
debian/1.1~0:refs/dgit/sid
@@
-47,7
+47,7
@@
prepare-replay () {
t-commit "request with $delib that we will replay"
t-dgit build
t-commit "request with $delib that we will replay"
t-dgit build
- t-expect-
fail "policy-hook.*No such file or directory"
\
+ t-expect-
push-fail E:'policy-hook.*No such file or directory'
\
t-dgit push $delib
t-policy dgit-repos-policy-trusting
t-dgit push $delib
t-policy dgit-repos-policy-trusting
@@
-58,7
+58,7
@@
prepare-replay () {
attempt-replay () {
local mpat=$1
git show debian/$replayv | grep -e $delib
attempt-replay () {
local mpat=$1
git show debian/$replayv | grep -e $delib
- t-expect-fail "$mpat" \
+ t-expect-
push-
fail "$mpat" \
git push "$remote" \
debian/$replayv \
+debian/$replayv~0:refs/dgit/sid
git push "$remote" \
debian/$replayv \
+debian/$replayv~0:refs/dgit/sid