From 280a4741b565352879cb2118b14976858ad5f4aa Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Nov 18 2011 20:07:25 +0000 Subject: Merge commit 'refs/merge-requests/12' of git://gitorious.org/testautomation/t_functional into merge-requests/12 --- diff --git a/AUTHORS b/AUTHORS index 17c1a51..6818151 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,4 +5,4 @@ Fabian Arrotin Athmane Madjoudj Steve Barnes Johnny Hughes -Christoph Galuschka +Christoph Galuschka diff --git a/tests/p_firefox/0-install_firefox.sh b/tests/p_firefox/0-install_firefox.sh new file mode 100755 index 0000000..829a0b7 --- /dev/null +++ b/tests/p_firefox/0-install_firefox.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# Author: Christoph Galuschka + +# Install firefox +t_InstallPackage firefox diff --git a/tests/p_firefox/firefox_test.sh b/tests/p_firefox/firefox_test.sh new file mode 100755 index 0000000..43aeacb --- /dev/null +++ b/tests/p_firefox/firefox_test.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# Author: Athmane Madjoudj +# Author: Christoph Galuschka + +t_Log "Running $0 - basic firefox test." + +# Only checking for correct output of '-v' +# both C5/C6 use V3.6 + +VERSION="3.6" + +firefox -v | grep "${VERSION}" >/dev/null 2>&1 + +# If checking versions is not desired +#firefox -v | grep "Firefox" >/dev/null 2>&1 +# Please choose the preferred method + +t_CheckExitStatus $? diff --git a/tests/p_freeradius/0-install_freeradius.sh b/tests/p_freeradius/0-install_freeradius.sh index 39103ed..d0f9ba7 100755 --- a/tests/p_freeradius/0-install_freeradius.sh +++ b/tests/p_freeradius/0-install_freeradius.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Install freeradius # On C5 both freeradius and freeradius2 are provided, however only freeradius2-utils are provided as well diff --git a/tests/p_freeradius/radiusd_test.sh b/tests/p_freeradius/radiusd_test.sh index c810b2d..0274ead 100755 --- a/tests/p_freeradius/radiusd_test.sh +++ b/tests/p_freeradius/radiusd_test.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Athmane Madjodj t_Log "Running $0 - freeradius-access test" diff --git a/tests/p_minicom/0-install_minicom.sh b/tests/p_minicom/0-install_minicom.sh index 9e80faf..d8a6d90 100755 --- a/tests/p_minicom/0-install_minicom.sh +++ b/tests/p_minicom/0-install_minicom.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Install minicom t_InstallPackage minicom diff --git a/tests/p_minicom/minicom_test.sh b/tests/p_minicom/minicom_test.sh index 76ed304..6412b91 100755 --- a/tests/p_minicom/minicom_test.sh +++ b/tests/p_minicom/minicom_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # Author: Athmane Madjoudj -# Author: Christoph Galuschka +# Author: Christoph Galuschka t_Log "Running $0 - very basic minicom test." diff --git a/tests/p_net-snmp/0-install_snmpd.sh b/tests/p_net-snmp/0-install_snmpd.sh index c38722e..b1feb08 100755 --- a/tests/p_net-snmp/0-install_snmpd.sh +++ b/tests/p_net-snmp/0-install_snmpd.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Install net-snmp t_InstallPackage net-snmp diff --git a/tests/p_net-snmp/snmpv2c_test.sh b/tests/p_net-snmp/snmpv2c_test.sh index 26b49c5..35f9779 100755 --- a/tests/p_net-snmp/snmpv2c_test.sh +++ b/tests/p_net-snmp/snmpv2c_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # Author: Athmane Madjoudj -# Author: Christoph Galuschka +# Author: Christoph Galuschka t_Log "Running $0 - snmpv2c test" diff --git a/tests/p_net-snmp/snmpv3_test.sh b/tests/p_net-snmp/snmpv3_test.sh index 1c27351..5328744 100755 --- a/tests/p_net-snmp/snmpv3_test.sh +++ b/tests/p_net-snmp/snmpv3_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # Author: Athmane Madjoudj -# Author: Christoph Galuschka +# Author: Christoph Galuschka t_Log "Running $0 - snmpv3 test" diff --git a/tests/p_rrdtool/0-install_rrdtool.sh b/tests/p_rrdtool/0-install_rrdtool.sh index edc2896..56b9e3d 100755 --- a/tests/p_rrdtool/0-install_rrdtool.sh +++ b/tests/p_rrdtool/0-install_rrdtool.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Athmane Madjoudj if (t_GetPkgRel basesystem | grep -q el6) diff --git a/tests/p_rrdtool/rrdtool_test.sh b/tests/p_rrdtool/rrdtool_test.sh index d2dbbfe..864ec98 100755 --- a/tests/p_rrdtool/rrdtool_test.sh +++ b/tests/p_rrdtool/rrdtool_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # Author: Athmane Madjoudj -# Author: Christph Galuschka +# Author: Christoph Galuschka # RRD-sample from http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html if (t_GetPkgRel basesystem | grep -q el6) diff --git a/tests/p_tcpdump/0_install_tcpdump.sh b/tests/p_tcpdump/0_install_tcpdump.sh index f64d244..ccf1308 100755 --- a/tests/p_tcpdump/0_install_tcpdump.sh +++ b/tests/p_tcpdump/0_install_tcpdump.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Install tcpdump t_InstallPackage tcpdump diff --git a/tests/p_tcpdump/tcpdump_test.sh b/tests/p_tcpdump/tcpdump_test.sh index 3e4eafc..4bc279e 100755 --- a/tests/p_tcpdump/tcpdump_test.sh +++ b/tests/p_tcpdump/tcpdump_test.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Author: Christoph Galuschka +# Author: Christoph Galuschka # Athmane Madjoudj t_Log "Running $0 - TCPdump test" diff --git a/tests/p_thunderbird/0-install_thunderbird.sh b/tests/p_thunderbird/0-install_thunderbird.sh new file mode 100755 index 0000000..3cb3fd4 --- /dev/null +++ b/tests/p_thunderbird/0-install_thunderbird.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# Author: Christoph Galuschka + +# Install thunderbird +t_InstallPackage thunderbird diff --git a/tests/p_thunderbird/thunderbird_test.sh b/tests/p_thunderbird/thunderbird_test.sh new file mode 100755 index 0000000..101f7fc --- /dev/null +++ b/tests/p_thunderbird/thunderbird_test.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# Author: Athmane Madjoudj +# Author: Christoph Galuschka + +t_Log "Running $0 - basic thunderbird test." + +# Only checking for correct output of '-v' +# with respect to different versions on C5 and C6 + +if (t_GetPkgRel basesystem | grep -q el6) +then + VERSION="3.1" +else + VERSION="2.0" +fi + +thunderbird -v | grep "${VERSION}" >/dev/null 2>&1 + +# If Versions are not dedsired +#thunderbird -v | grep "Thunderbird" >/dev/null 2>&1 +# works on both C5 and C6; please choose prefered way + +t_CheckExitStatus $? diff --git a/tests/p_wireshark/0-install_wireshark.sh b/tests/p_wireshark/0-install_wireshark.sh new file mode 100755 index 0000000..feabb99 --- /dev/null +++ b/tests/p_wireshark/0-install_wireshark.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Author: Christoph Galuschka +# Athmane Madjoudj + +if (t_GetPkgRel basesystem | grep -q el6) +then + # Install wireshark + t_InstallPackage wireshark +else + echo "Skipped on CentOS 5" +fi diff --git a/tests/p_wireshark/wireshark_test.sh b/tests/p_wireshark/wireshark_test.sh new file mode 100755 index 0000000..f29c242 --- /dev/null +++ b/tests/p_wireshark/wireshark_test.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# Author: Athmane Madjoudj +# Author: Christoph Galuschka + +if (t_GetPkgRel basesystem | grep -q el6) +then + t_Log "Running $0 - basic wireshark test." + + # just checking version + + VERSION="wireshark 1.2" + wireshark -v | grep "${VERSION}" >/dev/null 2>&1 + # if version checking is not desired + #wireshark -v | grep "wireshark.org" >/dev/null 2>&1 + # please choose the preferred method + t_CheckExitStatus $? +else + echo "Skipped on CentOS 5" +fi