diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-23 22:53:53 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-23 22:53:53 -0700 |
| commit | e14d64a03c6aa3e567b57f0c0a003ca2185f4493 (patch) | |
| tree | 3891d16b9d79df70d42c7116d2dc57857b9a5fc8 /tests/data | |
| parent | 8441fe20fdd1d8bb195bc7d354c9e87d2f446ccd (diff) | |
| download | vyos-cloud-init-e14d64a03c6aa3e567b57f0c0a003ca2185f4493.tar.gz vyos-cloud-init-e14d64a03c6aa3e567b57f0c0a003ca2185f4493.zip | |
Add a bunch of new merging test files + runner.
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/merge_sources/expected1.yaml | 1 | ||||
| -rw-r--r-- | tests/data/merge_sources/expected2.yaml | 3 | ||||
| -rw-r--r-- | tests/data/merge_sources/expected3.yaml | 1 | ||||
| -rw-r--r-- | tests/data/merge_sources/expected4.yaml | 2 | ||||
| -rw-r--r-- | tests/data/merge_sources/source1-1.yaml | 3 | ||||
| -rw-r--r-- | tests/data/merge_sources/source1-2.yaml | 5 | ||||
| -rw-r--r-- | tests/data/merge_sources/source2-1.yaml | 6 | ||||
| -rw-r--r-- | tests/data/merge_sources/source2-2.yaml | 5 | ||||
| -rw-r--r-- | tests/data/merge_sources/source3-1.yaml | 4 | ||||
| -rw-r--r-- | tests/data/merge_sources/source3-2.yaml | 4 | ||||
| -rw-r--r-- | tests/data/merge_sources/source4-1.yaml | 3 | ||||
| -rw-r--r-- | tests/data/merge_sources/source4-2.yaml | 6 |
12 files changed, 43 insertions, 0 deletions
diff --git a/tests/data/merge_sources/expected1.yaml b/tests/data/merge_sources/expected1.yaml new file mode 100644 index 00000000..640d282b --- /dev/null +++ b/tests/data/merge_sources/expected1.yaml @@ -0,0 +1 @@ +Blah: ['blah2', 'b'] diff --git a/tests/data/merge_sources/expected2.yaml b/tests/data/merge_sources/expected2.yaml new file mode 100644 index 00000000..6eccc2cf --- /dev/null +++ b/tests/data/merge_sources/expected2.yaml @@ -0,0 +1,3 @@ +Blah: 3 +Blah2: 2 +Blah3: [1] diff --git a/tests/data/merge_sources/expected3.yaml b/tests/data/merge_sources/expected3.yaml new file mode 100644 index 00000000..32d9ad48 --- /dev/null +++ b/tests/data/merge_sources/expected3.yaml @@ -0,0 +1 @@ +Blah: [blah2, 'blah1'] diff --git a/tests/data/merge_sources/expected4.yaml b/tests/data/merge_sources/expected4.yaml new file mode 100644 index 00000000..d88d8f73 --- /dev/null +++ b/tests/data/merge_sources/expected4.yaml @@ -0,0 +1,2 @@ +#cloud-config +Blah: {} diff --git a/tests/data/merge_sources/source1-1.yaml b/tests/data/merge_sources/source1-1.yaml new file mode 100644 index 00000000..38e4e5e0 --- /dev/null +++ b/tests/data/merge_sources/source1-1.yaml @@ -0,0 +1,3 @@ +#cloud-config +Blah: ['blah2'] + diff --git a/tests/data/merge_sources/source1-2.yaml b/tests/data/merge_sources/source1-2.yaml new file mode 100644 index 00000000..2cd0e0e5 --- /dev/null +++ b/tests/data/merge_sources/source1-2.yaml @@ -0,0 +1,5 @@ +#cloud-config + +Blah: ['b'] + +merge_how: 'dict(recurse_array,no_replace)+list(append)' diff --git a/tests/data/merge_sources/source2-1.yaml b/tests/data/merge_sources/source2-1.yaml new file mode 100644 index 00000000..c7a33aaa --- /dev/null +++ b/tests/data/merge_sources/source2-1.yaml @@ -0,0 +1,6 @@ +#cloud-config + + +Blah: 1 +Blah2: 2 +Blah3: 3 diff --git a/tests/data/merge_sources/source2-2.yaml b/tests/data/merge_sources/source2-2.yaml new file mode 100644 index 00000000..8f2fdc1a --- /dev/null +++ b/tests/data/merge_sources/source2-2.yaml @@ -0,0 +1,5 @@ +#cloud-config + +Blah: 3 +Blah2: 2 +Blah3: [1] diff --git a/tests/data/merge_sources/source3-1.yaml b/tests/data/merge_sources/source3-1.yaml new file mode 100644 index 00000000..2303e906 --- /dev/null +++ b/tests/data/merge_sources/source3-1.yaml @@ -0,0 +1,4 @@ +#cloud-config +Blah: ['blah1'] + + diff --git a/tests/data/merge_sources/source3-2.yaml b/tests/data/merge_sources/source3-2.yaml new file mode 100644 index 00000000..dca2ad10 --- /dev/null +++ b/tests/data/merge_sources/source3-2.yaml @@ -0,0 +1,4 @@ +#cloud-config +Blah: ['blah2'] + +merge_how: 'dict(recurse_array,no_replace)+list(prepend)' diff --git a/tests/data/merge_sources/source4-1.yaml b/tests/data/merge_sources/source4-1.yaml new file mode 100644 index 00000000..e5b16872 --- /dev/null +++ b/tests/data/merge_sources/source4-1.yaml @@ -0,0 +1,3 @@ +#cloud-config +Blah: + b: 1 diff --git a/tests/data/merge_sources/source4-2.yaml b/tests/data/merge_sources/source4-2.yaml new file mode 100644 index 00000000..1844e0f8 --- /dev/null +++ b/tests/data/merge_sources/source4-2.yaml @@ -0,0 +1,6 @@ +#cloud-config +Blah: + b: null + + +merge_how: 'dict(allow_delete,no_replace)+list()' |