diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-02-13 12:25:40 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-02-13 12:25:40 +0000 |
| commit | 5fe2954fdc6452d34fab9c821f396a2a8804535a (patch) | |
| tree | 28c59f769e3f6646212e39306313ea2aeaff5ba7 /testing | |
| parent | 7bc95a0f3ebc3732b134c33baef0d9844619b4c2 (diff) | |
| download | gitano-5fe2954fdc6452d34fab9c821f396a2a8804535a.tar.gz | |
permits empty commit pushing to fail
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/library.yarn | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testing/library.yarn b/testing/library.yarn index 0ee658d..e6abaf5 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -181,9 +181,11 @@ Admin repo manipulation 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" - $GTT push $MATCH_1 $MATCH_2 $MATCH_3 gitano-admin.git > $DATADIR/stdout 2>$DATADIR/stderr + IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? (expecting failure,? )?pushes an empty commit in ([^ ]+) + $GTT rungit $MATCH_1 $MATCH_4 commit --allow-empty -m "Make an empty commit" + if $GTT push $MATCH_1 $MATCH_2 $MATCH_4 $MATCH_4.git > $DATADIR/stdout 2>$DATADIR/stderr; then + test "$MATCH_3" = "" + fi IMPLEMENTS WHEN ([a-z][a-z0-9]*) applies ([^ ]+) in ([^ ]+) $GTT rungit $MATCH_1 $MATCH_3 apply --cached - <"testing/content-patches/$MATCH_2" \ |