X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=test_merge.bash;h=de29d075c6e7b6f47a01fa3632852d6600a0f919;hb=dbc6acf03e24bcf6db0a7ed8863efc77856650c7;hp=004a613e9bc54f193ce20d3f64dd5dc9ed8712a5;hpb=cd3ddc482fff7d96341a33613f78da0cbbbecdf4;p=apex-tripleo-heat-templates.git

diff --git a/test_merge.bash b/test_merge.bash
old mode 100644
new mode 100755
index 004a613e..de29d075
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -12,7 +12,7 @@ run_test() {
     local expected=$2
     result=$(mktemp /tmp/test_merge.XXXXXX)
     fail=0
-    $cmd > $result
+    $cmd --output $result
     if ! cmp $result $expected ; then
         diff -u $expected $result || :
         echo FAIL - $cmd result does not match expected
@@ -23,7 +23,21 @@ run_test() {
     cleanup
 }
 echo
-run_test "python merge.py examples/source.yaml" examples/source_lib_result.yaml
+merge_py="./tripleo_heat_merge/merge.py"
+run_test "python $merge_py examples/source.yaml" examples/source_lib_result.yaml
+run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.yaml
+run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml
+run_test "python $merge_py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml
+run_test "python $merge_py --scale NovaCompute=3 examples/scale1.yaml" examples/scale_result.yaml
+run_test "python $merge_py --scale NovaCompute=3 examples/scale_map.yaml" examples/scale_map_result.yaml
+run_test "python $merge_py --hot examples/source_hot.yaml" examples/source_lib_result_hot.yaml
+run_test "python $merge_py --hot examples/source2_hot.yaml" examples/source2_lib_result_hot.yaml
+run_test "python $merge_py --hot examples/source_include_subkey_hot.yaml" examples/source_include_subkey_result_hot.yaml
+run_test "python $merge_py --hot examples/launchconfig1_hot.yaml examples/launchconfig2_hot.yaml" examples/launchconfig_result_hot.yaml
+run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale1_hot.yaml" examples/scale_result_hot.yaml
+run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml
+run_test "python $merge_py --hot --scale NovaCompute=5,1,2 examples/scale_map_hot.yaml" examples/scale_map_result_hot_blacklist.yaml
+run_test "python $merge_py --hot --scale NovaCompute=3, examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml
 echo
 trap - EXIT
 exit $fail