Merge pull request #1046 from matejak/tests_fixes

Tests fixes

Author: matusmarhefka

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y autoconf automake libtool lcov libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev swig libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev swig librtmp-dev
+  - sudo apt-get install -y autoconf automake libtool lcov libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev swig libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev swig librtmp-dev xsltproc
 
 language: c
 

tests/API/OVAL/unittests/test_object_component_type.sh

@@ -2,10 +2,11 @@
 
 stderr=`mktemp`
 
-set -e
 set -o pipefail
 
-$OSCAP oval eval $srcdir/test_object_component_type.oval.xml 2> $stderr || ret=$?
+$OSCAP oval eval $srcdir/test_object_component_type.oval.xml 2> $stderr
+ret=$?
+set -e
 [ $ret -eq 1 ]
 
 grep -q "Entity [']something_bogus['] has not been found in textfilecontent_item (id: [0-9]\+) specified by object [']oval:oscap:obj:10[']." $stderr

tests/API/XCCDF/unittests/test_xccdf_transformation.sh

@@ -5,6 +5,7 @@ set -o pipefail
 
 . ../../../test_common.sh
 
+function perform_test {
 # if xsltproc is not installed we will skip the test
 require xsltproc || return 255
 
@@ -20,3 +21,6 @@ $OSCAP xccdf validate $result
 assert_exists 1 '//*[namespace::*="http://checklists.nist.gov/xccdf/1.2"]'
 
 rm $result
+}
+
+perform_test

tests/probes/iflisteners/test_probes_iflisteners.sh

@@ -22,7 +22,7 @@ function test_probes_iflisteners {
 
     if [ `id -u` -ne 0 ]; then
         echo you need to be root
-        exit 255
+        return 255
     fi
 
     local ret_val=0;

tests/probes/maskattr/test_object_entity_mask.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "file" || return 255
 
 name=$(basename $0 .sh)
@@ -30,3 +31,6 @@ echo "Testing syschar values."
 [ "$($XPATH $result 'string(/oval_results/results/system/oval_system_characteristics/system_data/unix-sys:file_item/unix-sys:filepath)')" == "" ]
 
 rm $result
+}
+
+perform_test

tests/probes/maskattr/test_object_entity_mask_oval_5_9.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "file" || return 255
 
 name=$(basename $0 .sh)
@@ -30,3 +31,6 @@ echo "Testing syschar values."
 [ "$($XPATH $result 'string(/oval_results/results/system/oval_system_characteristics/system_data/unix-sys:file_item/unix-sys:filepath)')" == "" ]
 
 rm $result
+}
+
+perform_test

tests/probes/maskattr/test_object_entity_nomask.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "file" || return 255
 
 name=$(basename $0 .sh)
@@ -27,3 +28,6 @@ echo "Testing syschar values."
 [ "$($XPATH $result 'string(/oval_results/results/system/oval_system_characteristics/system_data/unix-sys:file_item/unix-sys:filepath)')" == "/etc/passwd" ]
 
 rm $result
+}
+
+perform_test

tests/probes/rpmverify/test_not_equals_operation.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "rpmverify" || return 255
 
 name=$(basename $0 .sh)
@@ -23,3 +24,6 @@ echo "Testing syschar values."
 [ "$($XPATH $result 'count(/oval_results/results/system/oval_system_characteristics/collected_objects/object[@id="oval:x:obj:2"]/reference)')" == "1" ]
 
 rm $result
+}
+
+perform_test

tests/probes/sysctl/test_sysctl_probe.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "sysctl" || return 255
 
 result=`mktemp`
@@ -17,4 +18,6 @@ assert_exists 1 "/oval_results/results/system/oval_system_characteristics/system
 
 rm $result
 rm $stderr
+}
 
+perform_test

tests/probes/sysctl/test_sysctl_probe_all.sh

@@ -4,6 +4,7 @@
 
 set -e -o pipefail
 
+function perform_test {
 probecheck "sysctl" || return 255
 
 name=$(basename $0 .sh)
@@ -34,5 +35,6 @@ sed -i -E "/^E: lt-probe_sysctl: Can't read sysctl value from /d" "$stderr"
 [ ! -s $stderr ]
 
 rm $stderr $result $ourNames $sysctlNames
+}
 
-
+perform_test