Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 31 insertions, 0 deletions

diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
new file mode 100644
index 00000000..674df840
--- /dev/null
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected
@@ -0,0 +1,31 @@
+# test what happens with multiple defines of a name.
+#
+# Note that svGetValue() will return "l4x", which
+# isn't correct in terms of shell-parsing. But we
+# don't consider only line-by-line, thus this is
+# expected.
+#
+# Also note that setting NAME will replace the last
+# occurance, and delete all previous once.
+
+#L1
+
+#L2
+
+some_key1=''
+some_key2=$'\U0x'
+some_key3=$'x\U0'
+
+#L4
+NAME=set-by-test1
+#NM: '
+
+#Lx-1
+#Lx-2
+NAME2=set-by-test2
+#Lx-3
+
+#Ly-1
+#Ly-2
+NAME3=set-by-test3
+#Ly-3