From 337e5cff6fb5f1f7eeeb55e910a645a23fc8f844 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Nov 18 2011 20:10:31 +0000 Subject: Remove ff, tb and wireshark test --- diff --git a/tests/p_firefox/0-install_firefox.sh b/tests/p_firefox/0-install_firefox.sh deleted file mode 100755 index 829a0b7..0000000 --- a/tests/p_firefox/0-install_firefox.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/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 deleted file mode 100755 index 43aeacb..0000000 --- a/tests/p_firefox/firefox_test.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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_thunderbird/0-install_thunderbird.sh b/tests/p_thunderbird/0-install_thunderbird.sh deleted file mode 100755 index 3cb3fd4..0000000 --- a/tests/p_thunderbird/0-install_thunderbird.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/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 deleted file mode 100755 index 101f7fc..0000000 --- a/tests/p_thunderbird/thunderbird_test.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 deleted file mode 100755 index feabb99..0000000 --- a/tests/p_wireshark/0-install_wireshark.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 deleted file mode 100755 index f29c242..0000000 --- a/tests/p_wireshark/wireshark_test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/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