Merge pull request #37 from olehermanse/testing

Small improvements to bash test scripts

Author: olehermanse

tests/run-format-tests.sh

@@ -8,12 +8,13 @@ echo "TODO: Uncomment set -e to make tests start failing"
 echo "These tests expect cfengine CLI to be installed globally or in venv"
 
 echo "Looking for CFEngine CLI:"
-which cfengine
+cfengine --version
 
 echo "Check that input and expected files exist:"
 ls -al tests/format/*.input.cf
 ls -al tests/format/*.expected.cf
 
+rm -rf tmp
 mkdir -p tmp
 
 echo "Check that input files match expected files:"

tests/run-lint-tests.sh

@@ -6,11 +6,12 @@ set -e
 echo "These tests expect cfengine CLI to be installed globally or in venv"
 
 echo "Looking for CFEngine CLI:"
-which cfengine
+cfengine --version
 
 echo "Check that test files are in expected location:"
 ls -al tests/lint/*.cf
 
+rm -rf tmp
 mkdir -p tmp
 
 echo "Run lint tests:"

tests/run-shell-tests.sh

@@ -6,12 +6,13 @@ set -e
 echo "These tests expect cfengine CLI to be installed globally or in venv"
 
 echo "Looking for CFEngine CLI:"
-which cfengine
+cfengine --version
 
 echo "Check that test files are in expected location:"
 ls -al tests/shell/*.sh
 ls -al tests/shell/00*.sh
 
+rm -rf tmp
 mkdir -p tmp
 
 echo "Run shell tests:"