summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2017-02-12 13:59:35 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2017-02-12 13:59:35 +0000
commit8f985b3a7421cdbb3d5199dd6572251169c5c2c9 (patch)
tree0ab0c5f28fa1ced24cbd683694828dae15fd0a57 /testing
parentb3b93e138ba16645dd0f55cae4e89577949bcb81 (diff)
downloadgitano-8f985b3a7421cdbb3d5199dd6572251169c5c2c9.tar.gz
logs stdout/stderr when patching gitano-admin
Diffstat (limited to 'testing')
-rw-r--r--testing/library.yarn19
1 files changed, 14 insertions, 5 deletions
diff --git a/testing/library.yarn b/testing/library.yarn
index 4d61251..7db33de 100644
--- a/testing/library.yarn
+++ b/testing/library.yarn
@@ -161,11 +161,20 @@ Admin repo manipulation
$GTT runcommand $MATCH_1 $MATCH_2 user del $MATCH_3 $TOKEN
IMPLEMENTS GIVEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? has patched gitano-admin with ([^ ]+)
- $GTT clone $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch
- $GTT rungit $MATCH_1 tmp-adminpatch apply --cached - <"testing/admin-patches/$MATCH_3"
- $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_3 rules change"
- $GTT push $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git
- rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)"
+ $GTT clone $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch \
+ >$DATADIR/stdout 2>$DATADIR/stderr
+ $GTT rungit $MATCH_1 tmp-adminpatch apply -v --cached - <"testing/admin-patches/$MATCH_3" \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
+ $GTT rungit $MATCH_1 tmp-adminpatch diff --cached \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
+ $GTT rungit $MATCH_1 tmp-adminpatch commit --allow-empty -m "Apply $MATCH_3 rules change" \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
+ $GTT rungit $MATCH_1 tmp-adminpatch show HEAD \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
+ $GTT push $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
+ rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)" \
+ >>$DATADIR/stdout 2>>$DATADIR/stderr
IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? pushes an empty commit in ([^ ]+)
$GTT rungit $MATCH_1 $MATCH_3 commit --allow-empty -m "Make an empty commit"