From dcd6e09045c37876ce0c7343e184e19eeb6bc1fe Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Dec 10 2011 08:38:44 +0000 Subject: changed wording in freeradius-install-script new test for tar --- diff --git a/tests/p_rrdtool/rrdtool_test.sh b/tests/p_rrdtool/rrdtool_test.sh index 864ec98..83094cb 100755 --- a/tests/p_rrdtool/rrdtool_test.sh +++ b/tests/p_rrdtool/rrdtool_test.sh @@ -5,7 +5,7 @@ if (t_GetPkgRel basesystem | grep -q el6) then - t_Log "Running $0 - basic rrdtool test." + t_Log "Running $0 - rrdtool: create rrd, write values and retrieve values test." # creating test RRD diff --git a/tests/p_tar/0_install_tar.sh b/tests/p_tar/0_install_tar.sh new file mode 100755 index 0000000..a897dbf --- /dev/null +++ b/tests/p_tar/0_install_tar.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Author: Christoph Galuschka + +t_Log "Running $0 - attempting to install tar." +t_InstallPackage tar + diff --git a/tests/p_tar/10-tar-test.sh b/tests/p_tar/10-tar-test.sh new file mode 100755 index 0000000..bef7717 --- /dev/null +++ b/tests/p_tar/10-tar-test.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Author: Athmane Madjoudj +# Author: Christoph Galuschka + +t_Log "Running $0 - tar create and extract archive test." + +# create dir and two files +TARDIR='/var/tmp/tar-test' +FILE1=$TARDIR/file1.txt +FILE2=$TARDIR/file2.txt + +mkdir -p $TARDIR +cat > $FILE1 < $FILE2 < /dev/null 2>&1 +/bin/rm -rf $TARDIR +if [ -e $TARDIR ] + then + t_log "something went wrong with deleting $TARDIR" + exit +fi + +#reextract from tar +tar -C / -xf /var/tmp/tarfile.tar +#checking file contents +grep -q 'file #1' $FILE1 +RESULT1=$? +grep -q 'file #2' $FILE2 +RESULT2=$? + +if ([ $RESULT1 == 0 ] && [ $RESULT2 == 0 ]) + then + ret_val=0 +fi + +t_CheckExitStatus $ret_val + +#reversing changes +/bin/rm -rf /var/tmp/tarfile.tar $TARDIR