diff options
author | Scott Moser <smoser@ubuntu.com> | 2015-02-24 12:00:13 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2015-02-24 12:00:13 -0500 |
commit | 9170dbcd6432ec7aa5d27882f0bb1d29957fc409 (patch) | |
tree | d2f5c0d996fb9eb24629172d2a54f70116b860d3 /tests/unittests/test_datasource | |
parent | d12d8cf6c29395ba6cd51dfcc1387d26b5c00f61 (diff) | |
parent | f1ee9275a504c20153b795923b1f51d3005d745c (diff) | |
download | vyos-cloud-init-9170dbcd6432ec7aa5d27882f0bb1d29957fc409.tar.gz vyos-cloud-init-9170dbcd6432ec7aa5d27882f0bb1d29957fc409.zip |
Azure: Fix consumption of user-data
This was previously broken in python3 as the userdata would be bytes
rather than a string.
LP: #1423972
Diffstat (limited to 'tests/unittests/test_datasource')
-rw-r--r-- | tests/unittests/test_datasource/test_azure.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index 38d70fcd..8112c69b 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -1,5 +1,5 @@ from cloudinit import helpers -from cloudinit.util import b64e, load_file +from cloudinit.util import b64e, decode_binary, load_file from cloudinit.sources import DataSourceAzure from ..helpers import TestCase, populate_dir @@ -231,9 +231,19 @@ class TestAzureDataSource(TestCase): self.assertEqual(defuser['passwd'], crypt.crypt(odata['UserPassword'], defuser['passwd'][0:pos])) + def test_userdata_plain(self): + mydata = "FOOBAR" + odata = {'UserData': {'text': mydata, 'encoding': 'plain'}} + data = {'ovfcontent': construct_valid_ovf_env(data=odata)} + + dsrc = self._get_ds(data) + ret = dsrc.get_data() + self.assertTrue(ret) + self.assertEqual(decode_binary(dsrc.userdata_raw), mydata) + def test_userdata_found(self): mydata = "FOOBAR" - odata = {'UserData': b64e(mydata)} + odata = {'UserData': {'text': b64e(mydata), 'encoding': 'base64'}} data = {'ovfcontent': construct_valid_ovf_env(data=odata)} dsrc = self._get_ds(data) |