summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:41:28 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-05-03 14:41:28 -0700
commit4a669649b17cf01b6f89f7902b6683d02ef0bee1 (patch)
tree6e20453047f74dccc8da58ab45f29e71a2f7de48 /tests/data/merge_sources
parente14d64a03c6aa3e567b57f0c0a003ca2185f4493 (diff)
downloadvyos-cloud-init-4a669649b17cf01b6f89f7902b6683d02ef0bee1.tar.gz
vyos-cloud-init-4a669649b17cf01b6f89f7902b6683d02ef0bee1.zip
More merging adjustments.
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added.
Diffstat (limited to 'tests/data/merge_sources')
-rw-r--r--tests/data/merge_sources/expected2.yaml4
-rw-r--r--tests/data/merge_sources/expected5.yaml7
-rw-r--r--tests/data/merge_sources/source5-1.yaml6
-rw-r--r--tests/data/merge_sources/source5-2.yaml8
4 files changed, 23 insertions, 2 deletions
diff --git a/tests/data/merge_sources/expected2.yaml b/tests/data/merge_sources/expected2.yaml
index 6eccc2cf..f5312eb1 100644
--- a/tests/data/merge_sources/expected2.yaml
+++ b/tests/data/merge_sources/expected2.yaml
@@ -1,3 +1,3 @@
-Blah: 3
+Blah: 1
Blah2: 2
-Blah3: [1]
+Blah3: 3
diff --git a/tests/data/merge_sources/expected5.yaml b/tests/data/merge_sources/expected5.yaml
new file mode 100644
index 00000000..628f5878
--- /dev/null
+++ b/tests/data/merge_sources/expected5.yaml
@@ -0,0 +1,7 @@
+#cloud-config
+
+Blah: 3
+Blah2: 2
+Blah3: [1]
+
+
diff --git a/tests/data/merge_sources/source5-1.yaml b/tests/data/merge_sources/source5-1.yaml
new file mode 100644
index 00000000..c7a33aaa
--- /dev/null
+++ b/tests/data/merge_sources/source5-1.yaml
@@ -0,0 +1,6 @@
+#cloud-config
+
+
+Blah: 1
+Blah2: 2
+Blah3: 3
diff --git a/tests/data/merge_sources/source5-2.yaml b/tests/data/merge_sources/source5-2.yaml
new file mode 100644
index 00000000..f61c96a2
--- /dev/null
+++ b/tests/data/merge_sources/source5-2.yaml
@@ -0,0 +1,8 @@
+#cloud-config
+
+Blah: 3
+Blah2: 2
+Blah3: [1]
+
+
+merge_how: 'dict(replace)+list(append)'