ENT-13699: Add shell test framework and migrate all tests

tests/shell/001_init.sh

@@ -1,10 +1,7 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
-ls cfbs.json
+assert_file_exists cfbs.json
+
+test_finish

tests/shell/002_add.sh

@@ -1,11 +1,8 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs --non-interactive add autorun
-grep masterfiles cfbs.json
+assert_file_contains cfbs.json masterfiles
+
+test_finish

tests/shell/003_download.sh

@@ -1,12 +1,9 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs download
 
-ls ~/.cfengine/cfbs/downloads/*
+assert_file_exists ~/.cfengine/cfbs/downloads/*
+
+test_finish

tests/shell/004_build.sh

@@ -1,10 +1,5 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs --non-interactive add autorun
@@ -13,4 +8,6 @@ cfbs --non-interactive add git
 cfbs --non-interactive add ansible
 cfbs build
 
-ls out/
+assert_file_exists out/
+
+test_finish

tests/shell/005_alias.sh

@@ -1,13 +1,10 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
-cfbs --non-interactive add groups > output.log
+run cfbs --non-interactive add groups
 
-grep "alias" output.log
-grep "Added module" output.log
+assert_output_contains "alias"
+assert_output_contains "Added module"
+
+test_finish

tests/shell/006_search.sh

@@ -1,17 +1,16 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
-cfbs search > all.log
-cfbs search mpf > mpf.log
-cfbs search masterfiles > masterfiles.log
 
-grep "python" all.log
-! grep "python" mpf.log
-grep "masterfiles" mpf.log
-grep "masterfiles" masterfiles.log
+run cfbs search
+assert_output_contains "python"
+
+run cfbs search mpf
+assert_output_not_contains "python"
+assert_output_contains "masterfiles"
+
+run cfbs search masterfiles
+assert_output_contains "masterfiles"
+
+test_finish

tests/shell/007_install.sh

@@ -1,23 +1,13 @@
-if [ x"$UNSAFE_TESTS" = x1 ]
-then
-    echo "Unsafe tests are enabled - running install test"
-else
-    echo "Warning: Unsafe tests are disabled - skipping install test"
-    exit 0
-fi
-
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+skip_unless_unsafe
+test_init
 rm -rf ~/.cfagent/inputs/
 
 cfbs --non-interactive init
 cfbs --non-interactive add autorun
 cfbs install
 
-ls ~/.cfagent/inputs/def.json
+assert_file_exists ~/.cfagent/inputs/def.json
 rm -rf ~/.cfagent/inputs/
+
+test_finish

tests/shell/008_remove.sh

@@ -1,12 +1,9 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
-grep '"name": "masterfiles"' cfbs.json
+assert_file_contains cfbs.json '"name": "masterfiles"'
 cfbs --non-interactive remove masterfiles --non-interactive
-! grep '"name": "masterfiles"' cfbs.json
+assert_file_not_contains cfbs.json '"name": "masterfiles"'
+
+test_finish

tests/shell/009_clean.sh

@@ -1,20 +1,17 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs --non-interactive add promise-type-git
-grep '"name": "library-for-promise-types-in-python"' cfbs.json
-grep '"name": "promise-type-git"' cfbs.json
+assert_file_contains cfbs.json '"name": "library-for-promise-types-in-python"'
+assert_file_contains cfbs.json '"name": "promise-type-git"'
 cfbs --non-interactive remove promise-type-git --non-interactive
-! grep '"name": "library-for-promise-types-in-python"' cfbs.json
-! grep '"name": "promise-type-git"' cfbs.json
+assert_file_not_contains cfbs.json '"name": "library-for-promise-types-in-python"'
+assert_file_not_contains cfbs.json '"name": "promise-type-git"'
 
 # Check that clean does nothing:
 cat cfbs.json > before.json
 cfbs --non-interactive clean
-diff cfbs.json before.json
+assert_diff cfbs.json before.json
+
+test_finish

tests/shell/010_local_add.sh

@@ -1,10 +1,5 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs status
@@ -18,18 +13,20 @@ echo 'bundle agent bogus_bundle {
 
 cfbs --non-interactive add ./bogus_file.cf
 
-grep '"name": "./bogus_file.cf"' cfbs.json
-grep '"copy ./bogus_file.cf services/cfbs/bogus_file.cf"' cfbs.json
-grep '"policy_files services/cfbs/bogus_file.cf"' cfbs.json
-grep '"bundles bogus_bundle"' cfbs.json
+assert_file_contains cfbs.json '"name": "./bogus_file.cf"'
+assert_file_contains cfbs.json '"copy ./bogus_file.cf services/cfbs/bogus_file.cf"'
+assert_file_contains cfbs.json '"policy_files services/cfbs/bogus_file.cf"'
+assert_file_contains cfbs.json '"bundles bogus_bundle"'
 
 cfbs status
 cfbs build
 
-grep '"inputs"' out/masterfiles/def.json
-grep 'bogus_file.cf' out/masterfiles/def.json
+assert_file_contains out/masterfiles/def.json '"inputs"'
+assert_file_contains out/masterfiles/def.json 'bogus_file.cf'
 
-grep '"control_common_bundlesequence_end"' out/masterfiles/def.json
-grep '"bogus_bundle"' out/masterfiles/def.json
+assert_file_contains out/masterfiles/def.json '"control_common_bundlesequence_end"'
+assert_file_contains out/masterfiles/def.json '"bogus_bundle"'
 
-ls out/masterfiles/services/cfbs/bogus_file.cf
+assert_file_exists out/masterfiles/services/cfbs/bogus_file.cf
+
+test_finish

tests/shell/011_update.sh

@@ -1,10 +1,5 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs --non-interactive add promise-type-ansible@0.1.1
@@ -16,37 +11,37 @@ cfbs --non-interactive update
 # Also, it should not break on new commits(!)
 # TODO: Use jq, a python script, cfbs validate or something similar
 
-cat cfbs.json | grep -F "name" | grep -F "Example"
-cat cfbs.json | grep -F "type" | grep -F "policy-set"
-cat cfbs.json | grep -F "description" | grep -F "Example description"
-
-cat cfbs.json | grep -F "name" | grep -F "promise-type-ansible"
-cat cfbs.json | grep -F "version" | grep -F "."
-cat cfbs.json | grep -F "commit"
-cat cfbs.json | grep -F "added_by" | grep -F "cfbs add"
-cat cfbs.json | grep -F "steps"
-cat cfbs.json | grep -F "copy ansible_promise.py modules/promises/"
-cat cfbs.json | grep -F "append enable.cf services/init.cf"
-cat cfbs.json | grep -F "tags" | grep -F "supported" | grep -F "promise-type"
-cat cfbs.json | grep -F "by" | grep -F "https://github.com/tranchitella"
-cat cfbs.json | grep -F "repo" | grep -F "https://github.com/cfengine/modules"
-cat cfbs.json | grep -F "subdirectory" | grep -F "promise-types/ansible"
-cat cfbs.json | grep -F "dependencies" | grep -F "library-for-promise-types-in-python"
-cat cfbs.json | grep -F "description" | grep -F "Promise type to run ansible playbooks"
-
-cat cfbs.json | grep -F "name" | grep -F "library-for-promise-types-in-python"
-cat cfbs.json | grep -F "description" | grep -F "Library enabling promise types implemented in python"
-cat cfbs.json | grep -F "tags" | grep -F "supported" | grep -F "library"
-cat cfbs.json | grep -F "repo" | grep -F "https://github.com/cfengine/modules"
-cat cfbs.json | grep -F "by" | grep -F "https://github.com/cfengine"
-cat cfbs.json | grep -F "version" | grep -F "."
-cat cfbs.json | grep -F "commit"
-cat cfbs.json | grep -F "subdirectory" | grep -F "libraries/python"
-cat cfbs.json | grep -F "added_by" | grep -F "promise-type-ansible"
-cat cfbs.json | grep -F "copy cfengine_module_library.py modules/promises/cfengine_module_library.py"
+assert_file_matches_regex cfbs.json '"name".*"Example'
+assert_file_matches_regex cfbs.json '"type".*"policy-set"'
+assert_file_matches_regex cfbs.json '"description".*"Example description"'
+
+assert_file_matches_regex cfbs.json '"name".*"promise-type-ansible"'
+assert_file_matches_regex cfbs.json '"version":.*[0-9]+\.[0-9]+'
+assert_file_contains cfbs.json '"commit"'
+assert_file_matches_regex cfbs.json '"added_by".*"cfbs add"'
+assert_file_contains cfbs.json '"steps"'
+assert_file_contains cfbs.json 'copy ansible_promise.py modules/promises/'
+assert_file_contains cfbs.json 'append enable.cf services/init.cf'
+assert_file_matches_regex cfbs.json '"tags".*"supported"'
+assert_file_matches_regex cfbs.json '"by".*"https://github.com/tranchitella"'
+assert_file_matches_regex cfbs.json '"repo".*"https://github.com/cfengine/modules"'
+assert_file_matches_regex cfbs.json '"subdirectory".*"promise-types/ansible"'
+assert_file_matches_regex cfbs.json '"dependencies".*"library-for-promise-types-in-python"'
+assert_file_matches_regex cfbs.json '"description".*"Promise type to run ansible playbooks'
+
+assert_file_matches_regex cfbs.json '"name".*"library-for-promise-types-in-python"'
+assert_file_matches_regex cfbs.json '"description".*"Library enabling promise types implemented in python'
+assert_file_matches_regex cfbs.json '"tags".*"library"'
+assert_file_matches_regex cfbs.json '"repo".*"https://github.com/cfengine/modules"'
+assert_file_matches_regex cfbs.json '"by".*"https://github.com/cfengine"'
+assert_file_matches_regex cfbs.json '"subdirectory".*"libraries/python"'
+assert_file_matches_regex cfbs.json '"added_by".*"promise-type-ansible"'
+assert_file_contains cfbs.json 'copy cfengine_module_library.py modules/promises/cfengine_module_library.py'
 
 cfbs status
 cfbs build
 
-ls out/masterfiles/promises.cf
-ls out/masterfiles/modules/promises/ansible_promise.py
+assert_file_exists out/masterfiles/promises.cf
+assert_file_exists out/masterfiles/modules/promises/ansible_promise.py
+
+test_finish

tests/shell/012_prepend_dot_slash.sh

@@ -1,8 +1,5 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 echo '
 bundle agent test_bundle
@@ -38,3 +35,5 @@ rm -rf .git
 cfbs --non-interactive init
 cfbs --non-interactive add test_policy.cf
 cfbs --non-interactive remove ./test_policy.cf --non-interactive
+
+test_finish

tests/shell/013_add_url_commit.sh

@@ -1,21 +1,16 @@
-set -e
-set -x
-cd tests/
-mkdir -p ./tmp/
-cd ./tmp/
-touch cfbs.json && rm cfbs.json
-rm -rf .git
+source "$(dirname "$0")/testlib.sh"
+test_init
 
 cfbs --non-interactive init
 cfbs --non-interactive add https://github.com/basvandervlies/cf_surfsara_lib@09e07dda690f5806d5f17be8e71d9fdcc51bbdf1
 
-grep https://github.com/basvandervlies/cf_surfsara_lib cfbs.json
-grep 09e07dda690f5806d5f17be8e71d9fdcc51bbdf1 cfbs.json
-grep scl cfbs.json
+assert_file_contains cfbs.json https://github.com/basvandervlies/cf_surfsara_lib
+assert_file_contains cfbs.json 09e07dda690f5806d5f17be8e71d9fdcc51bbdf1
+assert_file_contains cfbs.json scl
 
 cfbs build
-ls out/masterfiles/lib/scl/
-grep scl_dmidecode_example out/masterfiles/scl_example.json
+assert_file_exists out/masterfiles/lib/scl/
+assert_file_contains out/masterfiles/scl_example.json scl_dmidecode_example
 
 # Build should be possible to do on another machine
 # so let's test that it works after deleting the things which
@@ -27,14 +22,16 @@ rm -rf out/
 rm -rf ~/.cfengine/cfbs
 
 cfbs build
-ls out/masterfiles/lib/scl/
-grep scl_dmidecode_example out/masterfiles/scl_example.json
+assert_file_exists out/masterfiles/lib/scl/
+assert_file_contains out/masterfiles/scl_example.json scl_dmidecode_example
 
 # Finally, let's also test that we can build it again (now with the cached
 # files)
 
 rm -rf out/
 
 cfbs build
-ls out/masterfiles/lib/scl/
-grep scl_dmidecode_example out/masterfiles/scl_example.json
+assert_file_exists out/masterfiles/lib/scl/
+assert_file_contains out/masterfiles/scl_example.json scl_dmidecode_example
+
+test_finish