diff options
| author | mboelen <michael@cisofy.com> | 2014-09-15 14:01:09 +0400 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2014-09-15 14:01:09 +0400 |
| commit | c9fde8c2d11744cc0875bc3e5dd0abf096211755 (patch) | |
| tree | 0997d08919db7ec4e2aa9065c3e9aaf1671c4d6f /include/tests_ldap | |
| parent | 35d32fb5e40b86632677fd2256aebeddf926394a (diff) | |
Code cleanup and small enhancements
Diffstat (limited to 'include/tests_ldap')
| -rw-r--r-- | include/tests_ldap | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/include/tests_ldap b/include/tests_ldap index d41cd496..df931311 100644 --- a/include/tests_ldap +++ b/include/tests_ldap @@ -33,16 +33,16 @@ Register --test-no LDAP-2219 --weight L --network NO --description "Check running OpenLDAP instance" if [ ${SKIPTEST} -eq 0 ]; then #YYY add additional slash - FIND=`${PSBINARY} ax | grep "slapd" | grep -v "grep"` - if [ "${FIND}" = "" ]; then - Display --indent 2 --text "- Checking OpenLDAP instance..." --result "NOT FOUND" --color WHITE - logtext "Result: No running slapd process found." + IsRunning slapd + if [ ${RUNNING} -eq 0 ]; then + Display --indent 2 --text "- Checking OpenLDAP instance" --result "NOT FOUND" --color WHITE + logtext "Result: No running slapd process found." else - Display --indent 2 --text "- Checking OpenLDAP instance..." --result FOUND --color GREEN - logtext "Result: Found running slapd process" - SLAPDFOUND=1 - SLAPD_RUNNING=1 - fi + Display --indent 2 --text "- Checking OpenLDAP instance" --result FOUND --color GREEN + logtext "Result: Found running slapd process" + SLAPDFOUND=1 + SLAPD_RUNNING=1 + fi fi # ################################################################################# @@ -52,21 +52,21 @@ if [ ${SLAPD_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no LDAP-2224 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check presence slapd.conf" if [ ${SKIPTEST} -eq 0 ]; then - logtext "Test: Searching slapd.conf" - for I in ${SLAPD_CONF_LOCS}; do - if [ -f ${I}/slapd.conf ]; then - logtext "Result: found ${I}/slapd.conf" - SLAPD_CONF_LOCATION="${I}/slapd.conf" - else - logtext "Result: ${I} does not contain slapd.conf" - fi - done - # Check if we found a valid location - if [ ! "${SLAPD_CONF_LOCATION}" = "" ]; then - Display --indent 4 --text "- Checking slapd.conf..." --result FOUND --color GREEN + logtext "Test: Searching slapd.conf" + for I in ${SLAPD_CONF_LOCS}; do + if [ -f ${I}/slapd.conf ]; then + logtext "Result: found ${I}/slapd.conf" + SLAPD_CONF_LOCATION="${I}/slapd.conf" + else + logtext "Result: ${I} does not contain slapd.conf" + fi + done + # Check if we found a valid location + if [ ! "${SLAPD_CONF_LOCATION}" = "" ]; then + Display --indent 4 --text "- Checking slapd.conf" --result FOUND --color GREEN else - Display --indent 4 --text "- Checking slapd.conf..." --result "NOT FOUND" --color YELLOW - fi + Display --indent 4 --text "- Checking slapd.conf" --result "NOT FOUND" --color YELLOW + fi fi # ################################################################################# @@ -97,7 +97,6 @@ ################################################################################# # - wait_for_keypress # |