diff options
| author | Richard Maw <richard.maw@gmail.com> | 2016-12-18 18:01:55 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@gmail.com> | 2016-12-18 21:52:49 +0000 |
| commit | 49df8959ce8f77665b317bb9dd0b21a277dfcf96 (patch) | |
| tree | ac1b43bf80e9416b8717664ac8c850b090ef2f5c /testing | |
| parent | 556e6701287da136bed065f8189c4e237e52fb8a (diff) | |
| download | gitano-49df8959ce8f77665b317bb9dd0b21a277dfcf96.tar.gz | |
testing: Rename gtt {push,pull}viassh to {push,pull}
This is going to support smart HTTP {push,pull}
so it's incorrect to be named "via ssh".
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gitano-test-tool.in | 4 | ||||
| -rw-r--r-- | testing/library.yarn | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/testing/gitano-test-tool.in b/testing/gitano-test-tool.in index a5154b9..d998c0a 100644 --- a/testing/gitano-test-tool.in +++ b/testing/gitano-test-tool.in @@ -233,7 +233,7 @@ function cmd_teardownstandard() end end -function cmd_cloneviassh(user, key, repo, localname, ...) +function cmd_clone(user, key, repo, localname, ...) local exturl = generate_exturl(user, key, repo) run_program { env = { HOME = user_home(user) }, @@ -241,7 +241,7 @@ function cmd_cloneviassh(user, key, repo, localname, ...) } end -function cmd_pushviassh(user, key, localname, repo, ...) +function cmd_push(user, key, localname, repo, ...) local exturl = generate_exturl(user, key, repo) run_program { cwd = user_home(user) .. "/" .. localname, diff --git a/testing/library.yarn b/testing/library.yarn index 53bd267..d419684 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -42,10 +42,10 @@ Repository access ----------------- IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? clones ([^ ]+) as ([^ ]+)( with depth (\d+))? - $GTT cloneviassh $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" ${MATCH_5:+ --no-local --depth="$MATCH_6"} + $GTT clone $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" ${MATCH_5:+ --no-local --depth="$MATCH_6"} IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? pushes ([^ ]+) to ([^ ]+) - $GTT pushviassh $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" + $GTT push $MATCH_1 $MATCH_2 "$MATCH_3" "$MATCH_4" IMPLEMENTS WHEN ([a-z][a-z0-9]*),? using ([a-z][a-z0-9]*),? (expecting failure,? )?destroys ([^ ]+) using the (.+) token if $GTT runcommand $MATCH_1 $MATCH_2 \ @@ -122,15 +122,15 @@ 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 cloneviassh $MATCH_1 $MATCH_2 gitano-admin.git tmp-adminpatch + $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 pushviassh $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git + $GTT push $MATCH_1 $MATCH_2 tmp-adminpatch gitano-admin.git rm -r "$($GTT clonelocation $MATCH_1 tmp-adminpatch)" 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 pushviassh $MATCH_1 $MATCH_2 $MATCH_3 gitano-admin.git > $DATADIR/stdout 2>$DATADIR/stderr + $GTT push $MATCH_1 $MATCH_2 $MATCH_3 gitano-admin.git > $DATADIR/stdout 2>$DATADIR/stderr Specific commands ----------------- |