mset remoterepos="$reposmirror"
+commit-build-push-expect-log () {
+ local msg=$1
+ local mpat=$2
+ t-commit "$msg"
+ t-dgit build
+ LC_MESSAGES=C \
+ t-dgit push --new 2>&1 |tee $tmp/push.log
+ t-grep-mpat "$mpat" $tmp/push.log
+}
+
check-mirrored () {
t-reporefs master
t-reporefs mirror $pmirror
mset rsyncssh=$tmp/stunt-ssh
mset remoterepos=HOST:$reposmirror
-t-commit "stunt ssh test"
-t-dgit build
-t-dgit push --new
-# ^ mirror should fail due to lack of stunt-ssh-sentinel
+# mirror should fail due to lack of stunt-ssh-sentinel
+
+commit-build-push-expect-log "stunt ssh test" \
+ E:'mirror hook failed: .*exited'
ls -al $queuedir/$p.a
check-not-mirrored
mset hooktimeout=5
-t-commit "stall timeout test"
-t-dgit build
-t-dgit push --new
+commit-build-push-expect-log "stall timeout test" \
+ E:'mirror hook failed: .*timeout'
check-not-mirrored