openstack/deb-keystone
Code Issues Proposed changes

Merge "Make gen_pki.sh & debug_helper.sh bash8 compliant"

Browse Source
This commit is contained in:
Jenkins 2014-06-23 18:39:44 +00:00 committed by Gerrit Code Review
commit db0519dfa0
4 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/pki/gen_pki.sh
View File

@ -203,8 +203,7 @@ function check_openssl {
} }
function gen_sample_cms { function gen_sample_cms {
for json_file in "${CMS_DIR}/auth_token_revoked.json" "${CMS_DIR}/auth_token_unscoped.json" "${CMS_DIR}/auth_token_scoped.json" "${CMS_DIR}/revocation_list.json" for json_file in "${CMS_DIR}/auth_token_revoked.json" "${CMS_DIR}/auth_token_unscoped.json" "${CMS_DIR}/auth_token_scoped.json" "${CMS_DIR}/revocation_list.json"; do
do
openssl cms -sign -in $json_file -nosmimecap -signer $CERTS_DIR/signing_cert.pem -inkey $PRIVATE_DIR/signing_key.pem -outform PEM -nodetach -nocerts -noattr -out ${json_file/.json/.pem} openssl cms -sign -in $json_file -nosmimecap -signer $CERTS_DIR/signing_cert.pem -inkey $PRIVATE_DIR/signing_key.pem -outform PEM -nodetach -nocerts -noattr -out ${json_file/.json/.pem}
done done
} }

1
test-requirements.txt
View File

@ -1,4 +1,5 @@
hacking>=0.8.0,<0.9 hacking>=0.8.0,<0.9
bash8
# Optional backend: SQL # Optional backend: SQL
pysqlite pysqlite

3
tools/debug_helper.sh
View File

@ -8,8 +8,7 @@ TESTS_TO_RUN=$TMP_DIR/ks_to_run
python -m testtools.run discover -t ./ ./keystone/tests --list > $ALL_TESTS python -m testtools.run discover -t ./ ./keystone/tests --list > $ALL_TESTS
if [ "$1" ] if [ "$1" ]; then
then
grep "$1" < $ALL_TESTS > $TESTS_TO_RUN grep "$1" < $ALL_TESTS > $TESTS_TO_RUN
else else
mv $ALL_TESTS $TESTS_TO_RUN mv $ALL_TESTS $TESTS_TO_RUN

5
tox.ini
View File

@ -40,6 +40,11 @@ commands =
bash -c "find keystone -type f -regex '.*\.pot*' -print0| \ bash -c "find keystone -type f -regex '.*\.pot*' -print0| \
xargs -0 -n 1 msgfmt --check-format -o /dev/null" xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:bash8]
envdir = {toxworkdir}/venv
commands =
bash8 examples/pki/gen_pki.sh tools/debug_helper.sh
[tox:jenkins] [tox:jenkins]
downloadcache = ~/cache/pip downloadcache = ~/cache/pip