summaryrefslogtreecommitdiff
path: root/tests/unittests
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-02-24 09:07:53 -0500
committerScott Moser <smoser@ubuntu.com>2015-02-24 09:07:53 -0500
commit3be2a3aaf66601f1218676050f08010c5465ef7e (patch)
treedc7bb2055c7335094e12f73653a5d0d173293e04 /tests/unittests
parent9ab6bbab42ffb5cadbe0afb36aa6967ed94459c3 (diff)
parent14d75254351009087efb5baa5cef808c5ef43e17 (diff)
downloadvyos-cloud-init-3be2a3aaf66601f1218676050f08010c5465ef7e.tar.gz
vyos-cloud-init-3be2a3aaf66601f1218676050f08010c5465ef7e.zip
merge from trunk
Diffstat (limited to 'tests/unittests')
-rw-r--r--tests/unittests/helpers.py5
-rw-r--r--tests/unittests/test_datasource/test_azure.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index ce77af93..7516bd02 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -287,10 +287,11 @@ def populate_dir(path, files):
if not os.path.exists(path):
os.makedirs(path)
for (name, content) in files.items():
- with open(os.path.join(path, name), "w") as fp:
- fp.write(content)
+ with open(os.path.join(path, name), "wb") as fp:
+ fp.write(content.encode('utf-8'))
fp.close()
+
try:
skipIf = unittest.skipIf
except AttributeError:
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
index 965bce4b..38d70fcd 100644
--- a/tests/unittests/test_datasource/test_azure.py
+++ b/tests/unittests/test_datasource/test_azure.py
@@ -360,6 +360,12 @@ class TestAzureDataSource(TestCase):
self.assertTrue(os.path.exists(ovf_env_path))
self.assertEqual(xml, load_file(ovf_env_path))
+ def test_ovf_can_include_unicode(self):
+ xml = construct_valid_ovf_env(data={})
+ xml = u'\ufeff{0}'.format(xml)
+ dsrc = self._get_ds({'ovfcontent': xml})
+ dsrc.get_data()
+
def test_existing_ovf_same(self):
# waagent/SharedConfig left alone if found ovf-env.xml same as cached
odata = {'UserData': b64e("SOMEUSERDATA")}