diff options
Diffstat (limited to 'tests/dogtag/acceptance/cli-tests/pki-user-cli')
5 files changed, 44 insertions, 36 deletions
diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh index 617895587..4552973af 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh @@ -587,7 +587,7 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-add-member Administrators $user > $TmpDir/pki-user-add-ca-007_1.out" \ + group-member-add Administrators $user > $TmpDir/pki-user-add-ca-007_1.out" \ 0 \ "Add user $user to Administrators group" @@ -598,14 +598,14 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-find-member Administrators > $TmpDir/pki-user-add-ca-007.out" \ + group-member-find Administrators > $TmpDir/pki-user-add-ca-007.out" \ 0 \ - "Show pki group-find-member Administrators" + "Show pki group-member-find Administrators" rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-add-member \"Certificate Manager Agents\" $user > $TmpDir/pki-user-add-ca-007_1_1.out" \ + group-member-add \"Certificate Manager Agents\" $user > $TmpDir/pki-user-add-ca-007_1_1.out" \ 0 \ "Add user $user to Administrators group" @@ -616,9 +616,9 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-find-member \"Certificate Manager Agents\" > $TmpDir/pki-user-add-ca-007_2.out" \ + group-member-find \"Certificate Manager Agents\" > $TmpDir/pki-user-add-ca-007_2.out" \ 0 \ - "Show pki group-find-member Administrators" + "Show pki group-member-find Administrators" rlAssertGrep "User: $user" "$TmpDir/pki-user-add-ca-007_2.out" rlPhaseEnd @@ -717,7 +717,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-adminE-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a agent cert" - rlAssertGrep "RuntimeException: java.io.IOException: SocketException cannot read on socket" "$TmpDir/pki-user-add-ca-adminE-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-adminE-002.out" rlRun "date --set='2 days ago'" 0 "Set System back to the present day" rlPhaseEnd @@ -735,7 +735,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-agentE-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a agent cert" - rlAssertGrep "RuntimeException: java.io.IOException: SocketException cannot read on socket" "$TmpDir/pki-user-add-ca-agentE-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-agentE-002.out" rlRun "date --set='2 days ago'" 0 "Set System back to the present day" rlPhaseEnd @@ -785,7 +785,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-adminUTCA-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a untrusted cert" - rlAssertGrep "ClientResponseFailure: Error status 401 Unauthorized returned" "$TmpDir/pki-user-add-ca-adminUTCA-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-adminUTCA-002.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_add-CA-0014: Cannot add user using a CA_agentUTCA" @@ -800,14 +800,14 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-agentUTCA-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a untrusted cert" - rlAssertGrep "RuntimeException: java.net.SocketException: Object not found: org.mozilla.jss.crypto.ObjectNotFoundException" "$TmpDir/pki-user-add-ca-agentUTCA-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-agentUTCA-002.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_cleanup-001_15: Deleting the temp directory and users" del_user=($CA_adminV_user $CA_adminR_user $CA_adminE_user $CA_adminUTCA_user $CA_agentV_user $CA_agentR_user $CA_agentE_user $CA_agentUTCA_user $CA_auditV_user $CA_operatorV_user) #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 25] ; do + while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh index 8f3a82d7d..62a81b23a 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh @@ -124,7 +124,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member Administrators $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add Administrators $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Administrators group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -134,7 +134,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member \"Certificate Manager Agents\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add \"Certificate Manager Agents\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Certificate Manager Agents group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -145,7 +145,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member Auditors $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add Auditors $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Auditors group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -156,7 +156,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member \"Trusted Managers\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add \"Trusted Managers\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Trusted Managers group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -180,17 +180,17 @@ run_pki-user-cli-user-ca_tests(){ rlRun "sed -e '/-----BEGIN NEW CERTIFICATE REQUEST-----/d' -i /tmp/requestdb/request_001$i.out" rlRun "sed -e '/-----END NEW CERTIFICATE REQUEST-----/d' -i /tmp/requestdb/request_001$i.out" rlRun "dos2unix /tmp/requestdb/request_001$i.out" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='cert_request_type']/value\" -v 'pkcs10' $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='cert_request']/value\" -v \"$(cat -v /tmp/requestdb/request_001$i.out)\" $temp_file" 0 "adding certificate request" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_uid']/value\" -v $userid $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_e']/value\" -v $userid@example.com $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_cn']/value\" -v $userfullName $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_ou']/value\" -v Engineering $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_o']/value\" -v Example $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_c']/value\" -v US $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_name']/value\" -v $userid $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_email']/value\" -v $userid@example.com $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_phone']/value\" -v 123-456-7890 $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='cert_request_type']/Value\" -v 'pkcs10' $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='cert_request']/Value\" -v \"$(cat -v /tmp/requestdb/request_001$i.out)\" $temp_file" 0 "adding certificate request" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_uid']/Value\" -v $userid $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_e']/Value\" -v $userid@example.com $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_cn']/Value\" -v $userfullName $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_ou']/Value\" -v Engineering $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_o']/Value\" -v Example $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_c']/Value\" -v US $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_name']/Value\" -v $userid $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_email']/Value\" -v $userid@example.com $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_phone']/Value\" -v 123-456-7890 $temp_file" if [ $userid == $CA_adminV_user -o $userid == $CA_adminR_user -o $userid == $CA_agentV_user -o $userid == $CA_agentR_user -o $userid == $CA_auditV_user -o $userid == $CA_operatorV_user ]; then #cert-request-submit===== @@ -241,7 +241,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" @@ -308,7 +308,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" rlLog "Modifying profile back to the defaults" @@ -333,7 +333,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" elif [ $userid == $CA_agentUTCA_user ]; then @@ -342,7 +342,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" #Revoke certificate of user CA_adminR and CA_agentR diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh index b31a96325..bf977106c 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh @@ -73,6 +73,10 @@ run_pki-user-cli-user-del-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 while [ $i -lt 25 ] ; do + rlLog "pki -d /tmp/requestdb \ + -n CA_adminV \ + -c $nss_db_password \ + user-del u$i" rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ @@ -97,10 +101,14 @@ run_pki-user-cli-user-del-ca_tests(){ j=1 while [ $j -lt 8 ] ; do eval usr=\$user$j + rlLog "pki -d /tmp/requestdb \ + -n CA_adminV \ + -c $nss_db_password \ + user-del $usr " rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ - user-del $usr> $TmpDir/pki-user-del-ca-user2-00$j.out" \ + user-del $usr > $TmpDir/pki-user-del-ca-user2-00$j.out" \ 0 \ "Deleted user $usr" rlAssertGrep "Deleted user \"$usr\"" "$TmpDir/pki-user-del-ca-user2-00$j.out" diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh index 5a318a3fd..d52863368 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh @@ -54,11 +54,11 @@ user7=0 ######################################################################## run_pki-user-cli-user-find-ca_tests(){ - rlPhaseStartSetup "pki_user_cli_user_show-ca-startup:Getting the temp directory and nss certificate db " + rlPhaseStartSetup "pki_user_cli_user_find-ca-startup:Getting the temp directory and nss certificate db " rlLog "nss_db directory = $TmpDir/nssdb" rlLog "temp directory = /tmp/requestdb" rlPhaseEnd - rlPhaseStartSetup "pki_user_cli_user_show-ca-startup-addusers:Add users to test the user-find functionality" + rlPhaseStartSetup "pki_user_cli_user_find-ca-startup-addusers:Add users to test the user-find functionality" i=1 while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ @@ -108,7 +108,7 @@ run_pki-user-cli-user-find-ca_tests(){ user-find --size=$maximum_check > $TmpDir/pki-user-find-ca-003.out 2>&1" \ 0 \ "All users" - rlAssertGrep "Number of entries returned 46" "$TmpDir/pki-user-find-ca-003.out" + rlAssertGrep "Number of entries returned 47" "$TmpDir/pki-user-find-ca-003.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_find-ca-004: Find users, check for negative input --size=-1" @@ -202,7 +202,7 @@ run_pki-user-cli-user-find-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 24] ; do + while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh index 34efa4bc0..a52c1d536 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh @@ -593,7 +593,7 @@ run_pki-user-cli-user-show-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 24] ; do + while [ $i -lt 24 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ |