From 4a669649b17cf01b6f89f7902b6683d02ef0bee1 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 3 May 2013 14:41:28 -0700
Subject: 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.
---
 tests/data/merge_sources/expected2.yaml | 4 ++--
 tests/data/merge_sources/expected5.yaml | 7 +++++++
 tests/data/merge_sources/source5-1.yaml | 6 ++++++
 tests/data/merge_sources/source5-2.yaml | 8 ++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 tests/data/merge_sources/expected5.yaml
 create mode 100644 tests/data/merge_sources/source5-1.yaml
 create mode 100644 tests/data/merge_sources/source5-2.yaml

(limited to 'tests/data/merge_sources')

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)'
-- 
cgit v1.2.3