diff options
| author | Niranjan Mallapadi <mrniranjan@redhat.com> | 2014-07-17 11:40:48 +0530 |
|---|---|---|
| committer | Niranjan Mallapadi <mrniranjan@redhat.com> | 2014-07-18 13:51:37 +0530 |
| commit | ece8a8a4e9788f5ec0f60f0a219edd153760f47f (patch) | |
| tree | e7eed57e7dbc015e0877823e99301410a87d5f2b /tests | |
| parent | 43e0afb4cb5565556d166da7549b59c801ea21cc (diff) | |
| download | pki-ece8a8a4e9788f5ec0f60f0a219edd153760f47f.tar.gz pki-ece8a8a4e9788f5ec0f60f0a219edd153760f47f.tar.xz pki-ece8a8a4e9788f5ec0f60f0a219edd153760f47f.zip | |
Fixed minor issues on pki cert-find
Re-added pki cert-find in Makefile and runtest
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dogtag/Makefile | 1 | ||||
| -rwxr-xr-x | tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh | 6 | ||||
| -rwxr-xr-x | tests/dogtag/runtest.sh | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/dogtag/Makefile b/tests/dogtag/Makefile index cbcb76bba..61c730deb 100755 --- a/tests/dogtag/Makefile +++ b/tests/dogtag/Makefile @@ -114,6 +114,7 @@ build: $(BUILT_FILES) chmod a+x ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-submit-ca.sh chmod a+x ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-profile-find-ca.sh chmod a+x ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-profile-show-ca.sh + chmod a+x ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh #group CA chmod a+x ./acceptance/cli-tests/pki-group-cli/pki-group-cli-group-add-ca.sh chmod a+x ./acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-ca.sh diff --git a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh index 2ceb7c8ba..988241211 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh @@ -65,10 +65,11 @@ run_pki-cert-find-ca_tests() local admin_cert_nickname="PKI Administrator for $CA_DOMAIN" local target_host=$(hostname) local target_port=8080 + local target_https_port=8443 # Creating Temporary Directory for pki cert-show - rlPhaseStartSetup "pki cert-show Temporary Directory" + rlPhaseStartSetup "pki cert-find Temporary Directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" local TEMP_NSS_DB="$TmpDir/nssdb" @@ -4180,8 +4181,6 @@ run_pki-cert-find-ca_tests() rlPhaseEnd rlPhaseStartTest "pki_cert_find-0173: Issue pki cert-find using host URI parameter(https)" - local target_https_port=8443 - local target_host=$(hostname) rlRun "pki -d $CERTDB_DIR \ -U https://$target_host:$target_https_port \ cert-find 1> $cert_find_info" @@ -4194,6 +4193,7 @@ run_pki-cert-find-ca_tests() -u $pki_user \ -w $pki_pwd \ cert-find 1> $cert_find_info" + rlAssertGrep "Number of entries returned 20" "$cert_find_info" rlPhaseEnd rlPhaseStartTest "pki_cert_find-0175: Issue pki cert-find using in-valid user" diff --git a/tests/dogtag/runtest.sh b/tests/dogtag/runtest.sh index 1bcee53db..36d23f9c9 100755 --- a/tests/dogtag/runtest.sh +++ b/tests/dogtag/runtest.sh @@ -68,6 +68,7 @@ . ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-submit-ca.sh . ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-profile-find-ca.sh . ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-request-profile-show-ca.sh +. ./acceptance/cli-tests/pki-cert-cli/pki-cert-cli-find-ca.sh . ./acceptance/cli-tests/pki-group-cli/pki-group-cli-group-add-ca.sh . ./acceptance/cli-tests/pki-group-cli/pki-group-cli-group-show-ca.sh . ./acceptance/cli-tests/pki-group-cli/pki-group-cli-group-find-ca.sh @@ -289,6 +290,11 @@ rlJournalStart # Execute pki cert-request-profile-show tests run_pki-cert-request-profile-show-ca_tests fi + CERT_FIND_CA_UPPERCASE=$(echo $CERT_FIND_CA | tr [a-z] [A-Z]) + if [ "$CERT_FIND_CA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then + # Execute pki cert-find tests + run_pki-cert-find-ca_tests + fi GROUP_ADD_UPPERCASE=$(echo $GROUP_ADD | tr [a-z] [A-Z]) if [ "$GROUP_ADD_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-add-ca tests |