diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-12-18 15:15:30 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-12-18 15:15:30 +0000 |
commit | 3c8aed5255a71f59ff8df3363bc1c378ca702a8f (patch) | |
tree | 361c504ce630b182741edaa21832268e06a6bd68 | |
parent | 5fd394f923fcd28863387a96b1fbbc904efe7ae5 (diff) | |
download | gitano-3c8aed5255a71f59ff8df3363bc1c378ca702a8f.tar.gz |
Rename rules-patches to admin-patches since that's what they are
-rw-r--r-- | TESTING | 6 | ||||
-rw-r--r-- | testing/01-basics.yarn | 2 | ||||
-rw-r--r-- | testing/02-commands-copy.yarn | 2 | ||||
-rw-r--r-- | testing/02-commands-create.yarn | 2 | ||||
-rw-r--r-- | testing/02-commands-destroy.yarn | 2 | ||||
-rw-r--r-- | testing/02-commands-graveyard.yarn | 2 | ||||
-rw-r--r-- | testing/02-commands-rename.yarn | 2 | ||||
-rw-r--r-- | testing/admin-patches/personal-repo-create.patch (renamed from testing/rules-patches/personal-repo-create.patch) | 0 | ||||
-rw-r--r-- | testing/admin-patches/post-receive-alert.patch (renamed from testing/rules-patches/post-receive-alert.patch) | 0 | ||||
-rw-r--r-- | testing/library.yarn | 12 |
10 files changed, 15 insertions, 15 deletions
@@ -45,9 +45,9 @@ The fundamental parts of the `testing/` directory are * `keys/`: This directory contains a set of keys which are used in various parts of the test suite -* `rules-patches/`: This directory contains patches to the ruleset which can be - applied during tests. If you change the skeleton ruleset for Gitano, you may - need to refresh these patches. +* `admin-patches/`: This directory contains patches to the gitano-admin.git + which can be applied during tests. If you change the skeleton ruleset (or + otherwise) for Gitano, you may need to refresh these patches. * `library.yarn`: This contains the implementations for the test suite yarn statements. diff --git a/testing/01-basics.yarn b/testing/01-basics.yarn index a25331f..3cc9afc 100644 --- a/testing/01-basics.yarn +++ b/testing/01-basics.yarn @@ -131,7 +131,7 @@ discourage the human doing this. AND the output contains DO NOT DO THIS AND the output contains DANGER AND the output contains VERY RISKY - GIVEN testinstance using adminkey has patched rules with post-receive-alert.patch + GIVEN testinstance using adminkey has patched gitano-admin with post-receive-alert.patch WHEN testinstance using adminkey clones gitano-admin.git as gitano-admin AND testinstance using adminkey pushes an empty commit in gitano-admin WHEN testinstance using bypasskey pushes an empty commit in gitano-admin diff --git a/testing/02-commands-copy.yarn b/testing/02-commands-copy.yarn index 05cefc3..fed2a7c 100644 --- a/testing/02-commands-copy.yarn +++ b/testing/02-commands-copy.yarn @@ -40,7 +40,7 @@ so all copies by other users will fail. Users may copy repositories where they may write to the destination path, but will be unable to do so if the repository already exists. - GIVEN testinstance using adminkey has patched rules with personal-repo-create.patch + GIVEN testinstance using adminkey has patched gitano-admin with personal-repo-create.patch WHEN alice main runs create personal/alice/testrepo AND alice main, expecting failure, runs copy public/testrepo personal/alice/testrepo THEN stderr contains ERROR: Repository personal/alice/testrepo already exists diff --git a/testing/02-commands-create.yarn b/testing/02-commands-create.yarn index 761e853..e131ca6 100644 --- a/testing/02-commands-create.yarn +++ b/testing/02-commands-create.yarn @@ -2,7 +2,7 @@ SCENARIO user-created repositories GIVEN a standard instance - AND testinstance using adminkey has patched rules with personal-repo-create.patch + AND testinstance using adminkey has patched gitano-admin with personal-repo-create.patch AND a unix user called alice AND alice has keys called main WHEN testinstance, using adminkey, adds user alice, using alice main diff --git a/testing/02-commands-destroy.yarn b/testing/02-commands-destroy.yarn index 4bb440e..b2ba340 100644 --- a/testing/02-commands-destroy.yarn +++ b/testing/02-commands-destroy.yarn @@ -2,7 +2,7 @@ SCENARIO repository destruction GIVEN a standard instance - AND testinstance using adminkey has patched rules with personal-repo-create.patch + AND testinstance using adminkey has patched gitano-admin with personal-repo-create.patch AND a unix user called alice AND alice has keys called main WHEN testinstance, using adminkey, adds user alice, using alice main diff --git a/testing/02-commands-graveyard.yarn b/testing/02-commands-graveyard.yarn index 18fe1fd..739540a 100644 --- a/testing/02-commands-graveyard.yarn +++ b/testing/02-commands-graveyard.yarn @@ -2,7 +2,7 @@ SCENARIO graveyard GIVEN a standard instance - AND testinstance using adminkey has patched rules with personal-repo-create.patch + AND testinstance using adminkey has patched gitano-admin with personal-repo-create.patch AND a unix user called alice AND alice has keys called main WHEN testinstance, using adminkey, adds user alice, using alice main diff --git a/testing/02-commands-rename.yarn b/testing/02-commands-rename.yarn index 659d3a3..c8b16a9 100644 --- a/testing/02-commands-rename.yarn +++ b/testing/02-commands-rename.yarn @@ -14,7 +14,7 @@ When a repository is renamed it does not modify any of the refs. SCENARIO rename permissions GIVEN a standard instance - AND testinstance using adminkey has patched rules with personal-repo-create.patch + AND testinstance using adminkey has patched gitano-admin with personal-repo-create.patch GIVEN a unix user called alice AND alice has keys called main WHEN testinstance, using adminkey, adds user alice, using alice main diff --git a/testing/rules-patches/personal-repo-create.patch b/testing/admin-patches/personal-repo-create.patch index aceb1a1..aceb1a1 100644 --- a/testing/rules-patches/personal-repo-create.patch +++ b/testing/admin-patches/personal-repo-create.patch diff --git a/testing/rules-patches/post-receive-alert.patch b/testing/admin-patches/post-receive-alert.patch index 5785567..5785567 100644 --- a/testing/rules-patches/post-receive-alert.patch +++ b/testing/admin-patches/post-receive-alert.patch diff --git a/testing/library.yarn b/testing/library.yarn index 89d28bf..9f3160c 100644 --- a/testing/library.yarn +++ b/testing/library.yarn @@ -118,12 +118,12 @@ Admin repo manipulation TOKEN=$($GTT runcommand $MATCH_1 $MATCH_2 user del $MATCH_3 2>&1 | $GTT findtoken) $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 rules with ([^ ]+) - $GTT cloneviassh $MATCH_1 $MATCH_2 gitano-admin.git tmp-rulepatch - $GTT rungit $MATCH_1 tmp-rulepatch apply --cached - <"testing/rules-patches/$MATCH_3" - $GTT rungit $MATCH_1 tmp-rulepatch commit --allow-empty -m "Apply $MATCH_3 rules change" - $GTT pushviassh $MATCH_1 $MATCH_2 tmp-rulepatch gitano-admin.git - rm -r "$($GTT clonelocation $MATCH_1 tmp-rulepatch)" + 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 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 + 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" |