Merge branch 'tests-installation' into 'master'

Tests installation

See merge request CCThomX/installation!17

script-install.sh

@@ -797,88 +797,4 @@ echo
 
 
 ### INSTALLATION TEST
-
-## DATABASE
-if [ "${DATABASE}" -eq "1" ]
-then
-  echo "Following asked password is MariaDB password for tango database"
-  RESULT_DATABASE=$(mysql -h localhost -u tango tango -p -e "SHOW tables")
-  if [ "${RESULT_DATABASE}" != "${CORRECT_OUTPUT_DATABASE}" ]
-  then
-    info "DATABASE successfully installed"
-  else
-    warning "DATABASE installation failed!"
-  fi
-fi
-
-## TANGO
-if [ "${TANGO}" -eq "1" ]
-then
-  ### yat & yat4tango
-  if [ -d /usr/include/yat ] \
-     && [ -d /usr/include/yat4tango ] \
-     && [ -e /usr/lib/libyat.so ] \
-     && [ -e /usr/lib/libyat4tango.so ]
-  then
-    info "yat & yat4tango successfully installed"
-  else
-    warning "yat & yat4tango installation failed!"
-  fi
-
-  ### Java version
-  #### check if Java is not openjdk
-  if [[ $(java -version 2>&1) != *"OpenJDK"* ]]
-  then
-    info "Sun Java JDK successfully installed"
-  else
-    error "OpenJDK Java has been installed" ${E_INCORRECT_JDK}
-  fi
-
-  ### TangoTest
-
-  #### if TangoTest/test is not defined
-  /usr/lib/tango/tango_admin --check-server TangoTest/test
-  TANGOTEST_DS_UNDEFINED=$?
-  if [[ ${TANGOTEST_DS_UNDEFINED} -ne 0 ]]
-  then
-    error "TangoTest Device Server is not defined" ${E_TANGOTEST_DS_UNDEFINED}
-  fi
-  #### if sys/tg_test/1 is not defined
-  /usr/lib/tango/tango_admin --check-device sys/tg_test/1
-  TANGOTEST_DEVICE_UNDEFINED=$?
-  if [[ "${TANGOTEST_DEVICE_UNDEFINED}" -ne 0 ]]
-  then
-    error "sys/tg_test/1 device is not defined" ${E_TANGOTEST_DEVICE_UNDEFINED}
-  fi
-  #### if TangoTest/test does not respond to ping
-  /usr/lib/tango/tango_admin --ping-device sys/tg_test/1 TANGOTEST_DEVICE_UNREACHABLE=$?
-  if [[ "${TANGOTEST_DEVICE_UNREACHABLE}" -ne 0 ]]
-  then
-    /usr/lib/tango/TangoTest test &
-    sleep 1
-    /usr/lib/tango/tango_admin --ping-device sys/tg_test/1
-    TANGOTEST_DEVICE_UNREACHABLE=$?
-    if [[ "${TANGOTEST_DEVICE_UNREACHABLE}" -ne 0 ]]
-    then
-      error "TangoTest/test does not respond to ping" ${E_TANGOTEST_DEVICE_UNREACHABLE}
-    else
-      info "TangoTest/test has been started"
-    fi
-  fi
-fi
-
-
-
-## TANGO_DB
-if [ "${TANGO_DB}" -eq "1" ]
-then
-  ### TANGO_HOST
-  source /etc/tangorc
-  if [ "${TANGO_HOST}" == "${TANGOSERVER}:20000" ]
-  then
-    info "TANGO_HOST correctly set to ${TANGO_HOST}"
-  else
-    warning "TANGO_HOST='${TANGO_HOST}' is not set to '${TANGO_HOST}'!"
-  fi
-fi
-
+source ./verif_env_thomx.sh

verif_env_thomx.sh

@@ -67,7 +67,7 @@ fi
 
 
 ## global variable definition
-CORRECT_TANGO_HOST="srv2.thomx.fr:20000"
+CORRECT_TANGO_HOST="srv-2.thomx.fr:20000"
 ERROR=0
 typeset -a PAQUETS_PIP PAQUETS_VERSION
 ## pip packages
@@ -351,3 +351,5 @@ echo
 echo "Starting sys/database/2 ATKPanel"
 atkpanel sys/database/2
 
+
+