summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/lib.yaml6
-rw-r--r--test_merge.bash33
2 files changed, 23 insertions, 16 deletions
diff --git a/examples/lib.yaml b/examples/lib.yaml
index e527d83f..d42e95f8 100644
--- a/examples/lib.yaml
+++ b/examples/lib.yaml
@@ -1,7 +1,9 @@
Parameters:
ImportantValue:
- Default: a_default
- Type: String
+ Default: a_default
+ Type: String
+ BImage:
+ Type: String
Resources:
GenericB:
Type: OS::Nova::Server
diff --git a/test_merge.bash b/test_merge.bash
index 35390aaa..004a613e 100644
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -7,18 +7,23 @@ cleanup() {
fi
}
trap cleanup EXIT
-result=$(mktemp /tmp/test_merge.XXXXXX)
-fail=0
-python merge.py examples/source.yaml > $result
-if ! cmp $result examples/source_lib_result.yaml ; then
- diff -u $result examples/source_lib_result.yaml
- echo
- echo FAIL - merge of source.yaml result does not match expected output
- echo
- fail=1
-else
- echo
- echo PASS - merge of source.yaml result matches expected output
- echo
-fi
+run_test() {
+ local cmd=$1
+ local expected=$2
+ result=$(mktemp /tmp/test_merge.XXXXXX)
+ fail=0
+ $cmd > $result
+ if ! cmp $result $expected ; then
+ diff -u $expected $result || :
+ echo FAIL - $cmd result does not match expected
+ fail=1
+ else
+ echo PASS - $cmd
+ fi
+ cleanup
+}
+echo
+run_test "python merge.py examples/source.yaml" examples/source_lib_result.yaml
+echo
+trap - EXIT
exit $fail