diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-02-26 14:10:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-02-26 14:10:17 -0500 |
| commit | c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad (patch) | |
| tree | 6f36dc496da710a02562f52d05c676b2c8479377 /tests/unittests/test_datasource/test_maas.py | |
| parent | e2fea567772f3d178072607aee617c3792185db0 (diff) | |
| parent | 0ebca9c158c87b28fb61974e9e36e645cf60494c (diff) | |
| download | vyos-cloud-init-c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad.tar.gz vyos-cloud-init-c9c811b2c3bad00cc1f0a3db6b7173bab3b1a7ad.zip | |
readurl, read_file_or_url returns bytes, user must convert as necessary
* explicitly test compressed user-data.
* userdata_raw is now bytes
* add load_tfile_or_url for loading text file or url
* ec2_utils: all meta-data is text, remove non-obvious string translations
* DigitalOcean: adjust for ec2_utils
* DataSourceGCE, DataSourceMAAS: user-data is binary other fields are text.
* openstack.py: read paths without decoding to text. This is ok as paths
other than user-data are json, and load_json will handle
* load_file still returns text, and that is what most things use.
LP: #1424900
Diffstat (limited to 'tests/unittests/test_datasource/test_maas.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_maas.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index d25e1adc..f109bb04 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -26,7 +26,7 @@ class TestMAASDataSource(TestCase): data = {'instance-id': 'i-valid01', 'local-hostname': 'valid01-hostname', - 'user-data': 'valid01-userdata', + 'user-data': b'valid01-userdata', 'public-keys': 'ssh-rsa AAAAB3Nz...aC1yc2E= keyname'} my_d = os.path.join(self.tmp, "valid") @@ -46,7 +46,7 @@ class TestMAASDataSource(TestCase): data = {'instance-id': 'i-valid-extra', 'local-hostname': 'valid-extra-hostname', - 'user-data': 'valid-extra-userdata', 'foo': 'bar'} + 'user-data': b'valid-extra-userdata', 'foo': 'bar'} my_d = os.path.join(self.tmp, "valid_extra") populate_dir(my_d, data) @@ -103,7 +103,7 @@ class TestMAASDataSource(TestCase): 'meta-data/instance-id': 'i-instanceid', 'meta-data/local-hostname': 'test-hostname', 'meta-data/public-keys': 'test-hostname', - 'user-data': 'foodata', + 'user-data': b'foodata', } valid_order = [ 'meta-data/local-hostname', @@ -143,7 +143,7 @@ class TestMAASDataSource(TestCase): userdata, metadata = DataSourceMAAS.read_maas_seed_url( my_seed, header_cb=my_headers_cb, version=my_ver) - self.assertEqual("foodata", userdata) + self.assertEqual(b"foodata", userdata) self.assertEqual(metadata['instance-id'], valid['meta-data/instance-id']) self.assertEqual(metadata['local-hostname'], |