Revert "Single quote iniset argument in merge_config_file"
This reverts commit e2c9fee8ed846aba124a2fc1bba245790ed7ba90.
We have decided that we don't want to support the json-style argument
as described by bug#1374118 (see thread at [1]).
This restores the old behavior of sending the argument in
double-quotes so environment variables get expanded. As a bonus,
tests for this are added.
[1] http://lists.openstack.org/pipermail/openstack-dev/2014-October/049341.html
Change-Id: I9fc99f3716cc53366907878adb00ae6cf3898f14
Closes-Bug:#1386413
diff --git a/tests/test_config.sh b/tests/test_config.sh
index cd74cee..3252104 100755
--- a/tests/test_config.sh
+++ b/tests/test_config.sh
@@ -92,9 +92,9 @@
[fff]
type=new
-[[test-quote|test-quote.conf]]
+[[test-env|test-env.conf]]
[foo]
-foo="foo bar" "baz"
+foo=\${FOO_BAR_BAZ}
[[test5|test-equals.conf]]
[DEFAULT]
@@ -126,9 +126,11 @@
[[test-multiline|test-multiline.conf]]
[multi]
-cfg_item1 = "ab":"cd", "ef": "gh"
+cfg_item1 = ab:cd:ef:gh
cfg_item1 = abcd
cfg_item2 = efgh
+cfg_item2 = \${FOO_BAR_BAZ}
+
EOF
echo -n "get_meta_section_files: test0 doesn't exist: "
@@ -236,14 +238,17 @@
echo -n "merge_config_file test-multiline: "
rm -f test-multiline.conf
+FOO_BAR_BAZ="foo bar baz"
merge_config_file test.conf test-multiline test-multiline.conf
VAL=$(cat test-multiline.conf)
EXPECT_VAL='
[multi]
-cfg_item1 = "ab":"cd", "ef": "gh"
+cfg_item1 = ab:cd:ef:gh
cfg_item1 = abcd
-cfg_item2 = efgh'
+cfg_item2 = efgh
+cfg_item2 = foo bar baz'
check_result "$VAL" "$EXPECT_VAL"
+unset FOO_BAR_BAZ
echo -n "merge_config_group test2: "
rm test2a.conf
@@ -275,14 +280,16 @@
attribute = value"
check_result "$VAL" "$EXPECT_VAL"
-echo -n "merge_config_file test-quote: "
-rm -f test-quote.conf
-merge_config_file test.conf test-quote test-quote.conf
-VAL=$(cat test-quote.conf)
+echo -n "merge_config_file test-env: "
+rm -f test-env.conf
+FOO_BAR_BAZ="foo bar baz"
+merge_config_file test.conf test-env test-env.conf
+VAL=$(cat test-env.conf)
EXPECT_VAL='
[foo]
-foo = "foo bar" "baz"'
+foo = foo bar baz'
check_result "$VAL" "$EXPECT_VAL"
+unset FOO_BAR_BAZ
echo -n "merge_config_group test4 variable filename: "
setup_test4
@@ -332,6 +339,8 @@
servers = 10.11.12.13:80"
check_result "$VAL" "$EXPECT_VAL"
-rm -f test.conf test1c.conf test2a.conf test-quote.conf test-space.conf test-equals.conf test-strip.conf test-colon.conf
-rm -f test-multiline.conf test-multi-sections.conf
+rm -f test.conf test1c.conf test2a.conf \
+ test-space.conf test-equals.conf test-strip.conf \
+ test-colon.conf test-env.conf test-multiline.conf \
+ test-multi-sections.conf
rm -rf test-etc