diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-01-06 12:07:57 -0500 |
| commit | 24e32edfc4dbce532dde1d858fbdd7beebefb3aa (patch) | |
| tree | 9aeba34bc027109687a3a429c675cb33a10a56e5 /tests/unittests/test_datasource | |
| parent | 4de52eb92333245f2c88e386d57c16547b89ab97 (diff) | |
| parent | 38c851e58e09c5574661ef4b2d2e66f6e38063d1 (diff) | |
| download | vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.tar.gz vyos-cloud-init-24e32edfc4dbce532dde1d858fbdd7beebefb3aa.zip | |
merge from trunk
Diffstat (limited to 'tests/unittests/test_datasource')
| -rw-r--r-- | tests/unittests/test_datasource/test_digitalocean.py | 1 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_smartos.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/unittests/test_datasource/test_digitalocean.py b/tests/unittests/test_datasource/test_digitalocean.py index 04bee340..d1270fc2 100644 --- a/tests/unittests/test_datasource/test_digitalocean.py +++ b/tests/unittests/test_datasource/test_digitalocean.py @@ -51,6 +51,7 @@ DO_META = { MD_URL_RE = re.compile(r'http://169.254.169.254/metadata/v1/.*') + def _request_callback(method, uri, headers): url_path = urlparse(uri).path if url_path.startswith('/metadata/v1/'): diff --git a/tests/unittests/test_datasource/test_smartos.py b/tests/unittests/test_datasource/test_smartos.py index b197b600..65675106 100644 --- a/tests/unittests/test_datasource/test_smartos.py +++ b/tests/unittests/test_datasource/test_smartos.py @@ -342,8 +342,8 @@ class TestSmartOSDataSource(helpers.FilesystemMockingTestCase): """ User-data in the SmartOS world is supposed to be written to a file each and every boot. This tests to make sure that in the event the - legacy user-data is removed, the existing user-data is backed-up and - there is no /var/db/user-data left. + legacy user-data is removed, the existing user-data is backed-up + and there is no /var/db/user-data left. """ user_data_f = "%s/mdata-user-data" % self.legacy_user_d |