diff options
author | Thiago da Silva <thiago@redhat.com> | 2013-12-03 18:42:23 -0500 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-12-11 04:12:10 -0800 |
commit | cc2b0b7ae5bfc4cf3d24eeaf92646363f693fc2c (patch) | |
tree | 32fc30d19410d0ab3bb382e6805427121176377b /tools | |
parent | f3c8c36cddbf1801443af431bc7db2e6d844eaed (diff) |
renaming swauth tools to gswauth
cli tools for account and user mgmt have been renamed
from swauth-* to gswauth-*
Updated other configuration and test files accordingly
Change-Id: Iced3bb27fbd09da45754ddb264f8fb4528ab423c
Signed-off-by: Thiago da Silva <thiago@redhat.com>
Reviewed-on: http://review.gluster.org/6417
Reviewed-by: pushpesh sharma <psharma@redhat.com>
Tested-by: pushpesh sharma <psharma@redhat.com>
Reviewed-by: Shilpa MJ <smanjara@redhat.com>
Tested-by: Shilpa MJ <smanjara@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/6466
Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/gswauth_functional_tests.sh | 10 | ||||
-rwxr-xr-x | tools/tox_run.sh | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/tools/gswauth_functional_tests.sh b/tools/gswauth_functional_tests.sh index 0c09fa2..5e4b31a 100755 --- a/tools/gswauth_functional_tests.sh +++ b/tools/gswauth_functional_tests.sh @@ -59,10 +59,10 @@ run_generic_tests() gswauth_cleanup #swauth-prep - sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth" - sudo_env swauth-add-user -K gswauthkey -a test tester testing || fail "Unable to add user test" - sudo_env swauth-add-user -K gswauthkey -a test2 tester2 testing2 || fail "Unable to add user test2" - sudo_env swauth-add-user -K gswauthkey test tester3 testing3 || fail "Unable to add user test3" + sudo_env gswauth-prep -K gswauthkey || fail "Unable to prep gswauth" + sudo_env gswauth-add-user -K gswauthkey -a test tester testing || fail "Unable to add user test" + sudo_env gswauth-add-user -K gswauthkey -a test2 tester2 testing2 || fail "Unable to add user test2" + sudo_env gswauth-add-user -K gswauthkey test tester3 testing3 || fail "Unable to add user test3" nosetests -v --exe \ --with-xunit \ @@ -105,7 +105,7 @@ sudo service memcached start || fail "Unable to start memcached" sudo_env swift-init main start || fail "Unable to start swift" #swauth-prep -sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth" +sudo_env gswauth-prep -K gswauthkey || fail "Unable to prep gswauth" mkdir functional_tests > /dev/null 2>&1 nosetests -v --exe \ diff --git a/tools/tox_run.sh b/tools/tox_run.sh index da10630..0499690 100755 --- a/tools/tox_run.sh +++ b/tools/tox_run.sh @@ -80,11 +80,10 @@ sudo service memcached start || fail "Unable to start memcached" sudo_env swift-init main start || fail "Unable to start swift" #swauth-prep -sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth" -sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth" -sudo_env swauth-add-user -K gswauthkey -a test tester testing || fail "Unable to add user test" -sudo_env swauth-add-user -K gswauthkey -a test2 tester2 testing2 || fail "Unable to add user test2" -sudo_env swauth-add-user -K gswauthkey test tester3 testing3 || fail "Unable to add user test3" +sudo_env gswauth-prep -K gswauthkey || fail "Unable to prep gswauth" +sudo_env gswauth-add-user -K gswauthkey -a test tester testing || fail "Unable to add user test" +sudo_env gswauth-add-user -K gswauthkey -a test2 tester2 testing2 || fail "Unable to add user test2" +sudo_env gswauth-add-user -K gswauthkey test tester3 testing3 || fail "Unable to add user test3" # open the shell to the user bash --norc -i |