3125c7 remove java* prior to testing tomcat

Authored and Committed by hughesjr 6 years ago
    remove java* prior to testing tomcat
    
        
tests/p_tomcat/0-install_tomcat.sh CHANGED
@@ -1,6 +1,8 @@
1
1
#!/bin/bash
2
2
# Author: Athmane Madjoudj <athmanem@gmail.com>
3
3
4
+ yum -y remove java\*
5
+
4
6
if [ "$centos_ver" = "7" ] ;then
5
7
tomcat_packages="tomcat tomcat-admin-webapps tomcat-webapps"
6
8
elif [ "$centos_ver" = "6" ]; then
tests/p_tomcat/tomcat_manager_test.sh CHANGED
@@ -1,12 +1,12 @@
1
1
#!/bin/sh
2
2
# Author: Athmane Madjoudj <athmanem@gmail.com>
3
- uname_arch=$(uname -m)
4
- if [ "$uname_arch" == "i686" ] ; then
5
- t_Log "Skipping $0 on $uname_arch"
6
- exit 0
7
- else
3
+ #uname_arch=$(uname -m)
4
+ #if [ "$uname_arch" == "i686" ] ; then
5
+ #t_Log "Skipping $0 on $uname_arch"
6
+ #exit 0
7
+ #else
8
8
t_Log "Running $0 - Tomcat Web Application Manager test."
9
- fi
9
+ #fi
10
10
curl -u admin:admin -s http://localhost:8080/manager/html | grep "Tomcat Web Application Manager" >/dev/null 2>&1
11
11
12
12
t_CheckExitStatus $?
tests/p_tomcat/tomcat_test.sh CHANGED
@@ -2,12 +2,12 @@
2
2
# Author: Athmane Madjoudj <athmanem@gmail.com>
3
3
4
4
uname_arch=$(uname -m)
5
- if [ "$uname_arch" == "i686" ] ; then
6
- t_Log "Skipping $0 on $uname_arch"
7
- exit 0
8
- else
5
+ #if [ "$uname_arch" == "i686" ] ; then
6
+ #t_Log "Skipping $0 on $uname_arch"
7
+ #exit 0
8
+ #else
9
9
t_Log "Running $0 - Tomcat basic test."
10
- fi
10
+ #fi
11
11
12
12
if [ "$centos_ver" = "7" ] ; then
13
13
string_tosearch="you've successfully installed Tomcat. Congratulations!"