diff options
| author | Barry Warsaw <barry@python.org> | 2015-01-26 14:31:09 -0500 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2015-01-26 14:31:09 -0500 |
| commit | de5974fe93dd717e0c7ba6de17db3192cc258cff (patch) | |
| tree | a877b3ee6d3362892c0683e054d62f8c0e924908 /tests/unittests/test_datasource/test_opennebula.py | |
| parent | 926a3df79a10ede61967c60f48ff0670a36e689a (diff) | |
| download | vyos-cloud-init-de5974fe93dd717e0c7ba6de17db3192cc258cff.tar.gz vyos-cloud-init-de5974fe93dd717e0c7ba6de17db3192cc258cff.zip | |
* More str/bytes fixes.
* Temporarily skip the MAAS tests in py3 since they need to be ported to oauthlib.
Diffstat (limited to 'tests/unittests/test_datasource/test_opennebula.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_opennebula.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py index 31c6232f..ef534bab 100644 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -33,7 +33,7 @@ TEST_VARS = { } INVALID_CONTEXT = ';' -USER_DATA = b'#cloud-config\napt_upgrade: true' +USER_DATA = '#cloud-config\napt_upgrade: true' SSH_KEY = 'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460-%i' HOSTNAME = 'foo.example.com' PUBLIC_IP = '10.0.0.3' @@ -300,7 +300,7 @@ class TestParseShellConfig(unittest.TestCase): def populate_context_dir(path, variables): data = "# Context variables generated by OpenNebula\n" - for (k, v) in variables.items(): + for k, v in variables.items(): data += ("%s='%s'\n" % (k.upper(), v.replace(r"'", r"'\''"))) populate_dir(path, {'context.sh': data}) |