diff options
author | Roshni Pattath <rpattath@redhat.com> | 2014-04-22 15:12:20 -0400 |
---|---|---|
committer | Roshni Pattath <rpattath@redhat.com> | 2014-04-22 15:13:08 -0400 |
commit | de4520fc0927bb4d07f2a3500dd9b091c411114a (patch) | |
tree | 4c0e1d511aa9231aaec8b8529aa7704bed46baf2 /tests | |
parent | fd7c02411aa7c5e8c7663e6dc026eeddc01bd932 (diff) | |
download | pki-de4520fc0927bb4d07f2a3500dd9b091c411114a.tar.gz pki-de4520fc0927bb4d07f2a3500dd9b091c411114a.tar.xz pki-de4520fc0927bb4d07f2a3500dd9b091c411114a.zip |
Minor fixes to pki user-cert-add and pki user-mod
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh | 2 | ||||
-rwxr-xr-x | tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh index d4e11048e..346b7dcf6 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-cert-add-ca.sh @@ -239,7 +239,7 @@ rlPhaseStartTest "pki_user_cli_user_cert-add-CA-005: Add revoked cert to a user local CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^} local decimal_valid_serialNumber_pkcs10=$(echo "ibase=16;$CONV_UPP_VAL_PKCS10"|bc) rlRun "pki -d $CERTDB_DIR/ \ - -n CA_adminV \ + -n \"$admin_cert_nickname\" \ -c $CERTDB_DIR_PASSWORD \ -t ca \ cert-revoke $cert_serialNumber --force > $TmpDir/pki_user_cert_add-CA_revokecert_005.out" diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh index 13afb5bfc..360e687bb 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-mod-ca.sh @@ -85,7 +85,8 @@ run_pki-user-cli-user-mod-ca_tests(){ rlAssertGrep "\--fullName <fullName> Full name" "$TmpDir/pki_user_mod_cfg.out" rlAssertGrep "\--phone <phone> Phone" "$TmpDir/pki_user_mod_cfg.out" rlAssertGrep "\--state <state> State" "$TmpDir/pki_user_mod_cfg.out" - rlLog "FAIL: https://fedorahosted.org/pki/ticket/843" + rlAssertGrep "\--help Show help options" "$TmpDir/pki_user_mod_cfg.out" + rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/pki_user_mod_cfg.out" rlPhaseEnd @@ -440,10 +441,6 @@ rlPhaseStartTest "pki_user_cli_user_mod-CA-017:--phone with maximum length and s rlPhaseStartTest "pki_user_cli_user_mod-CA-018:--phone with maximum length and numbers only " randsym=`cat /dev/urandom | tr -dc '0-9' | fold -w 1024 | head -n 1` - rlRun "pki -d $CERTDB_DIR \ - -n CA_adminV \ - -c $CERTDB_DIR_PASSWORD \ - user-add --fullName=test usr1" rlLog "Executing: pki -d $CERTDB_DIR \ -n CA_adminV \ -c $CERTDB_DIR_PASSWORD \ |