diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 14:41:28 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 14:41:28 -0700 |
| commit | 4a669649b17cf01b6f89f7902b6683d02ef0bee1 (patch) | |
| tree | 6e20453047f74dccc8da58ab45f29e71a2f7de48 /tests/unittests/test_userdata.py | |
| parent | e14d64a03c6aa3e567b57f0c0a003ca2185f4493 (diff) | |
| download | vyos-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/unittests/test_userdata.py')
| -rw-r--r-- | tests/unittests/test_userdata.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py index fdfe2542..5fb9acd9 100644 --- a/tests/unittests/test_userdata.py +++ b/tests/unittests/test_userdata.py @@ -60,7 +60,6 @@ run: - c ''' message1 = MIMEBase("text", "cloud-config") - message1['Merge-Type'] = 'dict()+list(extend)+str(append)' message1.set_payload(blob) blob2 = ''' @@ -72,7 +71,8 @@ run: - morestuff ''' message2 = MIMEBase("text", "cloud-config") - message2['X-Merge-Type'] = 'dict()+list(extend)+str()' + message2['X-Merge-Type'] = ('dict(recurse_array,' + 'recurse_str)+list(append)+str(append)') message2.set_payload(blob2) blob3 = ''' @@ -84,7 +84,6 @@ e: p: 1 ''' message3 = MIMEBase("text", "cloud-config") - message3['Merge-Type'] = 'dict()+list()+str()' message3.set_payload(blob3) messages = [message1, message2, message3] |