Fix return codes in pki-cert-show automation

Modified script to return 1 for pki failed commands
Modify function name to have same syntax as user automation scripts
Minor bugfixes like using of rlAssertExists instead of test -f
fix return values for negative tests
Add i18n tests

1 files changed, 39 insertions, 33 deletions

diff --git a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
index fe23558a7..7897dc4f2 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-cert-cli/pki-cert-show.sh
@@ -38,7 +38,7 @@
 . /opt/rhqa_pki/pki-cert-cli-lib.sh
 . /opt/rhqa_pki/env.sh
 
-run_pki_cert_show()
+run_pki-cert-show-ca_tests()
 {
 
 	local invalid_serialNumber=$(cat /dev/urandom | tr -dc '1-9' | fold -w 10 | head -n 1)
@@ -52,6 +52,7 @@ run_pki_cert_show()
 
 	local rand=$(cat /dev/urandom | tr -dc '0-9' | fold -w 5 | head -n 1)
 	local junk="axb124?$5@@_%^$#$@\!(_)043112321412321"
+	local cert_req_info="$TmpDir/cert_req_info.out"
 
 	# Creating Temporary Directory for pki cert-show
 
@@ -65,18 +66,20 @@ run_pki_cert_show()
 	rlPhaseStartSetup "Generating temporary Cert to be used pki cert-show automation Tests"
         local TEMP_NSS_DB="$TmpDir/nssdb"
 	local temp_out="$TmpDir/cert-show.out"
-        rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 "--" "--" "--" "--" "--" "--" "--" "pkcs10_reqstatus" "pkcs10_requestid" "pkcs10_requestdn""
+        rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 "--" "--" "--" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local pkcs10_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2) 
         rlRun "pki -d $CERTDB_DIR -c $CERTDB_DIR_PASSWORD -n \"$CA_agentV_user\" ca-cert-request-review $pkcs10_requestid --action approve 1> $TmpDir/pki-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
 	rlAssertGrep "Approved certificate request $pkcs10_requestid" "$TmpDir/pki-pkcs10-approve-out"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat crmf rsa 2048 "--" "--" "--" "--" "--" "--" "--" "crmf_reqstatus" "crmf_requestid" "crmf_requestdn""
+	rlRun "create_cert_request $TEMP_NSS_DB redhat crmf rsa 2048 "--" "--" "--" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local crmf_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 			-c $CERTDB_DIR_PASSWORD \
 			-n \"$CA_agentV_user\" \
 			ca-cert-request-review $crmf_requestid \
 			--action approve 1> $TmpDir/pki-crmf-approve-out"
 	rlAssertGrep "Approved certificate request $crmf_requestid" "$TmpDir/pki-crmf-approve-out"
-	rlRun "valid_pkcs10_serialNumber=\$(pki cert-request-show $pkcs10_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
-	rlRun "valid_crmf_serialNumber=\$(pki cert-request-show $crmf_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
+	local valid_pkcs10_serialNumber=$(pki cert-request-show $pkcs10_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
+	local valid_crmf_serialNumber=$(pki cert-request-show $crmf_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
 	STRIP_HEX_PKCS10=$(echo $valid_pkcs10_serialNumber | cut -dx -f2)
 	STRIP_HEX_CRMF=$(echo $valid_crmf_serialNumber | cut -dx -f2)
         CONV_UPP_VAL_PKCS10=${STRIP_HEX_PKCS10^^}
@@ -112,14 +115,14 @@ run_pki_cert_show()
 	#Run pki cert-show with No serial Number 
 
 	rlPhaseStartTest "pki_cert_show-002: pki cert-show should show usage details when no serial Number is given"
-	rlRun "pki cert-show  > $temp_out" 0 "pki cert-show without any serial number fails"
+	rlRun "pki cert-show  > $temp_out" 1,255 "pki cert-show without any serial number fails"
 	rlAssertGrep "usage: cert-show" "$temp_out"
 	rlPhaseEnd
 	
 	# Run pki cert-show with Invalid Serial Number in decimal
 
 	rlPhaseStartTest "pki_cert_show-003: pki cert-show < invalid serialNumber(Decimal) > should Fail"
-	rlRun "pki cert-show $invalid_serialNumber 2> $temp_out" 0 "command pki cert-show $invalid_serialNumber"
+	rlRun "pki cert-show $invalid_serialNumber 2> $temp_out" 1,255 "command pki cert-show $invalid_serialNumber"
 	rlAssertGrep "CertNotFoundException" "$temp_out"
 	rlPhaseEnd
 
@@ -137,14 +140,14 @@ run_pki_cert_show()
 	#Run pki cert-show with invalid serialNumber given in Hexadecimal
 	
 	rlPhaseStartTest "pki_cert_show-005: pki cert-show < invalid serialNumber(hexadecimal) > should fail"
-	rlRun "pki cert-show $invalid_hex_serialNumber 2> $temp_out" 0 "Executing pki cert-show $invalid_hex_serialNumber"
+	rlRun "pki cert-show $invalid_hex_serialNumber 2> $temp_out" 1,255 "Executing pki cert-show $invalid_hex_serialNumber"
 	rlAssertGrep "CertNotFoundException" "$temp_out"
 	rlPhaseEnd
 
 	# Run pki cert-show with Junk Characters
 
 	rlPhaseStartTest "pki_cert_show-006: pki cert-show < junk characters > should fail to show any certificate Details"
-	rlRun "pki cert-show \"$junk\" 2> $temp_out" 0 "Executing pki cert-show $junk"
+	rlRun "pki cert-show \"$junk\" 2> $temp_out" 1,255 "Executing pki cert-show $junk"
 	rlAssertGrep "NumberFormatException: For input string" "$temp_out"
 	rlPhaseEnd	
 	
@@ -162,7 +165,7 @@ run_pki_cert_show()
 	#Run pki cert-show --encoded with No serial Number
 
 	rlPhaseStartTest "pki_cert_show-008: pki cert-show <No SerialNumber> --encoded should fail"
-	rlRun "pki cert-show --encoded 1> $temp_out" 0 "Running pki cert-show <No-serial-Number> --encoded"
+	rlRun "pki cert-show --encoded 1> $temp_out" 1,255 "Running pki cert-show <No-serial-Number> --encoded"
 	rlAssertGrep "usage: cert-show" "$temp_out"
 	rlPhaseEnd
 	
@@ -170,8 +173,10 @@ run_pki_cert_show()
 	
 	rlPhaseStartTest "pki_cert_show-009: pki cert-show <In-Valid SerialNumber> --encoded should fail"
 	rlLog "Running pki cer-show <invalid-serial-Number> --encoded"
-	rlRun "pki cert-show $invalid_serialNumber --encoded 2> $temp_out" 0 "pki cert-show $serialNumber"
-	rlAssertGrep "CertNotFoundException: Certificate ID $invalid_hex_serialNumber not found" "$temp_out"
+	rlRun "pki cert-show $invalid_serialNumber --encoded 2> $temp_out" 1,255 "pki cert-show $serialNumber"
+	local invalid_hex_sno=$(echo "obase=16;$invalid_serialNumber"|bc)
+        local conv_lower_hex_invalidserialNum=${invalid_hex_sno,,}
+	rlAssertGrep "CertNotFoundException: Certificate ID 0x$conv_lower_hex_invalidserialNum not found" "$temp_out"
 	rlPhaseEnd
 	
 	# Run pki cert-show <valid serialNumber> --output <filename>(pkcs10)
@@ -198,12 +203,8 @@ run_pki_cert_show()
 
 	rlPhaseStartTest "pki_cert_show-0012: pki cert-show <invalid-serial-Number> --output <filename> should not create any file"
 	rlLog "Running pki cert-show <invalid-serialNumber> --output <filename>"
-	rlRun "pki cert-show $invalid_serialNumber --output $temp_out" 0 "pki cert-show <invalid-serial-number> --output <file>"
-	if $(test -f $temp_out); then
-		rlPass "$temp_out exists"	
-	else 
-		rlFail "$temp_out doesn't exist"
-	fi
+	rlRun "pki cert-show $invalid_serialNumber --output $temp_out" 1,255 "pki cert-show <invalid-serial-number> --output <file>"
+	rlAssertExists $temp_out
 	rlPhaseEnd
 
 	# Run pki cert-show <No serial number> --output <filename>
@@ -212,7 +213,7 @@ run_pki_cert_show()
 	local temp_out13=$TmpDir/cert-show13.out
 	local temp_out13_err=$TmpDir/cert-err13.out
 	rlLog "Running pki cert-show --output $temp_out13 0> $temp_out13_err" 
-	rlRun "pki cert-show --output $temp_ou13 1> $temp_out13_err" 0
+	rlRun "pki cert-show --output $temp_ou13 1> $temp_out13_err" 1,255
 	rlAssertGrep "usage:" "$temp_out13_err"  	
 	rlAssertGrep "--encoded         Base-64 encoded" "$temp_out13_err"
 	rlAssertGrep "--output <file>   Output file" "$temp_out13_err"
@@ -234,7 +235,7 @@ run_pki_cert_show()
 
 	rlPhaseStartTest "pki_cert_show-0015: pki cert-show < $invalid_serialNumber > --pretty <filename> should fail to produce any PrettyPrint output"
 	local temp_out1="$TmpDir/cert-show1.out"
-	rlRun "pki cert-show $invalid_hex_serialNumber --pretty 2> $temp_out1" 0 "Executing pki cert-show $invalid_hex_serialNumber --pretty"
+	rlRun "pki cert-show $invalid_hex_serialNumber --pretty 2> $temp_out1" 1,255 "Executing pki cert-show $invalid_hex_serialNumber --pretty"
 	rlAssertGrep "CertNotFoundException: Certificate ID $invalid_hex_serialNumber not found" "$temp_out1"
 	rlPhaseEnd
 
@@ -242,7 +243,7 @@ run_pki_cert_show()
 
 	rlPhaseStartTest "pki_cert_show-0016: pki cert-show <No serialNumber> --pretty <filename> should fail to produce any PrettyPrint output"
 	rlLog "Running pki cert-show --pretty" 1
-	rlRun "pki cert-show --pretty 1> $temp_out" 0
+	rlRun "pki cert-show --pretty 1> $temp_out" 1,255
 	rlAssertGrep "usage:" "$temp_out"
 	rlAssertGrep "--encoded         Base-64 encoded" "$temp_out"
 	rlAssertGrep "--output <file>   Output file" "$temp_out"
@@ -251,8 +252,9 @@ run_pki_cert_show()
 
 	# Run pki cert-show with i18n characters 
 	
-	rlPhaseStartTest "pki_cert_show-0017: Verify pki cert-show \"CN=Örjan Äke,UID=Örjan Äke\" i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Örjan Äke\" \"Örjan Äke\" \"test@example.org\" "--" "--" "--" "--" "i18n_ret_reqstatus" "i18n_ret_requestid""
+	rlPhaseStartTest "pki_cert_show-0017: Test-1 Verify pki cert-show with i18n Characters"
+	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Örjan Äke\" \"Örjan Äke\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 		-c $CERTDB_DIR_PASSWORD \
 		-n \"$CA_agentV_user\" \
@@ -265,8 +267,9 @@ run_pki_cert_show()
 	rlAssertGrep "UID=Örjan Äke" "$temp_out"
 	rlPhaseEnd
 	
-	rlPhaseStartTest "pki_cert_show-0018: Verify pki cert-show \"CN=Éric Têko,UID=Éric Têko\" i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Éric Têko\" \"Éric Têko\" \"test@example.org\" "--" "--" "--" "--" "i18n_ret_reqstatus" "i18n_ret_requestid""
+	rlPhaseStartTest "pki_cert_show-0018: Test-2 Verify pki cert-show with i18n Characters"
+	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"Éric Têko\" \"Éric Têko\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 		-c $CERTDB_DIR_PASSWORD \
 		-n \"$CA_agentV_user\" \
@@ -280,8 +283,9 @@ run_pki_cert_show()
 	rlPhaseEnd 
 
 
-	rlPhaseStartTest "pki_cert_show-0019: Verify pki cert-show \"CN=éénentwintig dvidešimt,UID=éénentwintig dvidešimt\" i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"éénentwintig dvidešimt\" \"éénentwintig dvidešimt\" \"test@example.org\" "--" "--" "--" "--" "i18n_ret_reqstatus" "i18n_ret_requestid""
+	rlPhaseStartTest "pki_cert_show-0019: Test-3 Verify pki cert-show with i18n Characters"
+	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"éénentwintig dvidešimt\" \"éénentwintig dvidešimt\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 		-c $CERTDB_DIR_PASSWORD \
 		-n \"$CA_agentV_user\" \
@@ -295,8 +299,9 @@ run_pki_cert_show()
 	rlPhaseEnd 
 
 
-	rlPhaseStartTest "pki_cert_show-0020: Verify pki cert-show \"CN=kakskümmend üks,UID=kakskümmend üks\" i18n Characters"
-	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"kakskümmend üks\" \"kakskümmend üks\" \"test@example.org\" "--" "--" "--" "--" "i18n_ret_reqstatus" "i18n_ret_requestid""
+	rlPhaseStartTest "pki_cert_show-0020: Test-4 Verify pki cert-show with i18n Characters"
+	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"kakskümmend üks\" \"kakskümmend üks\" \"test@example.org\" "--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 		-c $CERTDB_DIR_PASSWORD \
 		-n \"$CA_agentV_user\" \
@@ -309,21 +314,22 @@ run_pki_cert_show()
 	rlAssertGrep "UID=kakskümmend üks" "$temp_out"
 	rlPhaseEnd 
 	
-	rlPhaseStartTest "pki_cert_show-0021: Verify pki cert-show \"CN=двадцять один тридцять,UID=двадцять один тридцять\" i18n Characters"
+	rlPhaseStartTest "pki_cert_show-0021: Test-5 Verify pki cert-show with i18n Characters"
 	rlRun "create_cert_request $TEMP_NSS_DB redhat pkcs10 rsa 2048 \"двадцять один тридцять\" \"двадцять один тридцять\" \"test@example.org\" \
-	"--" "--" "--" "--" "i18n_ret_reqstatus" "i18n_ret_requestid""
+	"--" "--" "--" "--" "$(hostname)" "8080" "$cert_req_info""
+	local i18n_ret_requestid=$(cat $cert_req_info | grep Request_ID | cut -d- -f2)
 	rlRun "pki -d $CERTDB_DIR \
 		-c $CERTDB_DIR_PASSWORD \
 		-n \"$CA_agentV_user\" \
 		ca-cert-request-review $i18n_ret_requestid \
 		--action approve 1> $TmpDir/i18n-pkcs10-approve-out" 0 "As $CA_agentV_user Approve Certificate Request"
 	rlAssertGrep "Approved certificate request $i18n_ret_requestid" "$TmpDir/i18n-pkcs10-approve-out"
-	rlRun "valid_i18n_pkcs10_serialNumber=\$(pki cert-request-show $i18n_ret_requestid | grep \"Certificate ID\" | sed 's/ //g' | cut -d: -f2)"
+	local valid_i18n_pkcs10_serialNumber=$(pki cert-request-show $i18n_ret_requestid | grep "Certificate ID" | sed 's/ //g' | cut -d: -f2)
 	rlRun "pki cert-show $valid_i18n_pkcs10_serialNumber 1> $temp_out" 0 "Executing pki cert-show $valid_i18n_valid_pkcs10_serialNumber"
 	rlAssertGrep "CN=двадцять один тридцять" "$temp_out"
 	rlAssertGrep "UID=двадцять один тридцять" "$temp_out"
 	rlPhaseEnd 
-	
+
 	rlPhaseStartCleanup "pki cert-show cleanup: Delete temp dir"
 	rlRun "popd"
 	rlRun "rm -r $TmpDir" 0 "Removing tmp directory"