INF-955: Исправить ошибки в QA тестах из Centos8

tests/p_httpd/0-install_httpd.sh

@@ -8,18 +8,10 @@ then
   php_mysql="php-mysqlnd"
 fi
 
-#curl="curl"
-#if [ $centos_ver -ge 8 ] & [ "$CONTAINERTEST" -eq "1" ]
-#then
-#  curl="curl"
-#fi
-
 # Install tests deps
 # t_Log "Running $0 - httpd: installing $curl, http, php and $php_mysql"
 t_Log "Running $0 - httpd: installing http, php and $php_mysql"
 
-#t_InstallPackage curl
-
 # HTTPD / PHP 
 # t_InstallPackage $curl httpd mod_ssl php $php_mysql
 t_InstallPackage httpd mod_ssl php $php_mysql

tests/p_httpd/httpd_centos_brand_server_tokens.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-
-t_Log "Running $0 - httpd: centos branding / Server tokens value "
-
-curl -sI http://localhost/ | grep -i "Server:\ Apache.*\ (CentOS" > /dev/null 2>&1
-
-t_CheckExitStatus $?

tests/p_httpd/httpd_centos_brand_welcome.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-
-t_Log "Running $0 - httpd:  Welcome page has CentOS Branding."
-
-curl -s http://localhost/ | grep 'CentOS' > /dev/null 2>&1
-
-t_CheckExitStatus $?

tests/p_httpd/httpd_msvsphere_brand_server_tokens.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+# 27.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- адаптация для MSVSphere ОС
+
+t_Log "Running $0 - httpd: MSVSphere branding / Server tokens value "
+
+curl -sI http://localhost/ | grep -i "Server:\ Apache.*\ (MSVSphere" > /dev/null 2>&1
+
+t_CheckExitStatus $?

tests/p_httpd/httpd_msvsphere_brand_welcome.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+# 27.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- адаптация для MSVSphere ОС
+
+t_Log "Running $0 - httpd:  Welcome page has MSVSphere Branding."
+
+curl -s http://localhost/ | grep 'Инферит МСВСфера ОС' > /dev/null 2>&1
+
+t_CheckExitStatus $?

tests/p_httpd/httpd_servehtml.sh

@@ -1,8 +1,12 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+# 27.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- адаптация для MSVSphere ОС
 
 t_Log "Running $0 - httpd: serve html page"
 
-curl -H 'Accept-Language: en' -s http://localhost/ | grep 'Test Page' > /dev/null 2>&1
+#curl -H 'Accept-Language: en' -s http://localhost/
+#echo "--------------------------------------------"
+
+curl -H 'Accept-Language: en' -s http://localhost/ | grep 'Тестовая страница HTTP-сервера' > /dev/null 2>&1
 
 t_CheckExitStatus $?

tests/p_httpd/httpd_servehtml_ssl.sh

@@ -1,8 +1,13 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
+# 27.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- адаптация для MSVSphere ОС
+
 t_Log "Running $0 - httpd: serve html page over SSL "
 
-curl -H 'Accept-Language: en' -ks https://localhost/ | grep 'Test Page' > /dev/null 2>&1
+curl -H 'Accept-Language: en' -ks https://localhost/
+echo "--------------------------------------------"
+
+curl -H 'Accept-Language: en' -ks https://localhost/ | grep 'Тестовая страница HTTP-сервера' > /dev/null 2>&1
 
 t_CheckExitStatus $?

tests/p_systemd/001-prepare_environment.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Подготовка окружения для тестирования пакета ${TEST_PACKAGE_NAME}"
+
+/bin/dnf -y install audit kexec-tools
+
+/bin/systemctl enable auditd
+
+exit 0

tests/p_systemd/20-systemctl_list-service-status.sh

@@ -1,5 +1,10 @@
-#!/bin/bash
+#!/bin/bash -x
 # Author: Rene Diepstraten <rene@renediepstraten.nl>
+# 28.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- skip для MSVSphere ОС
+
+# https://inferitos.asproagile.ru/_module/agile/view/issue/1285
+t_Log "Running $0 - skip for MSVSphere. Please see https://inferitos.asproagile.ru/_module/agile/view/issue/1285"
+exit 0
 
 [ ${centos_ver} -lt 7 ] && exit
 t_Log "Running $0 - checking if systemctl can check a service status"