diff --git a/tests/p_tomcat/0-install_tomcat.sh b/tests/p_tomcat/0-install_tomcat.sh index 7335b26..bcbcc13 100755 --- a/tests/p_tomcat/0-install_tomcat.sh +++ b/tests/p_tomcat/0-install_tomcat.sh @@ -1,6 +1,8 @@ #!/bin/bash # Author: Athmane Madjoudj +yum -y remove java\* + if [ "$centos_ver" = "7" ] ;then tomcat_packages="tomcat tomcat-admin-webapps tomcat-webapps" elif [ "$centos_ver" = "6" ]; then diff --git a/tests/p_tomcat/tomcat_manager_test.sh b/tests/p_tomcat/tomcat_manager_test.sh index d15889c..a576f28 100755 --- a/tests/p_tomcat/tomcat_manager_test.sh +++ b/tests/p_tomcat/tomcat_manager_test.sh @@ -1,12 +1,12 @@ #!/bin/sh # Author: Athmane Madjoudj -uname_arch=$(uname -m) -if [ "$uname_arch" == "i686" ] ; then -t_Log "Skipping $0 on $uname_arch" -exit 0 -else +#uname_arch=$(uname -m) +#if [ "$uname_arch" == "i686" ] ; then +#t_Log "Skipping $0 on $uname_arch" +#exit 0 +#else t_Log "Running $0 - Tomcat Web Application Manager test." -fi +#fi curl -u admin:admin -s http://localhost:8080/manager/html | grep "Tomcat Web Application Manager" >/dev/null 2>&1 t_CheckExitStatus $? diff --git a/tests/p_tomcat/tomcat_test.sh b/tests/p_tomcat/tomcat_test.sh index 2b460d3..ee6e83a 100755 --- a/tests/p_tomcat/tomcat_test.sh +++ b/tests/p_tomcat/tomcat_test.sh @@ -2,12 +2,12 @@ # Author: Athmane Madjoudj uname_arch=$(uname -m) -if [ "$uname_arch" == "i686" ] ; then -t_Log "Skipping $0 on $uname_arch" -exit 0 -else +#if [ "$uname_arch" == "i686" ] ; then +#t_Log "Skipping $0 on $uname_arch" +#exit 0 +#else t_Log "Running $0 - Tomcat basic test." -fi +#fi if [ "$centos_ver" = "7" ] ; then string_tosearch="you've successfully installed Tomcat. Congratulations!"