diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
commit | b0ea6e5a2c1c26b8faf1dc8303feebb00344e537 (patch) | |
tree | 1ec50e5f8c07ab1c7b4e206a5d0c7dca0858b640 /tests/unittests/test_datasource/test_cloudsigma.py | |
parent | fe6919dcd37c6c1ecd371e5eb20b605ab20a6420 (diff) | |
parent | 776b0cfe847f531d8d5a235f52673c3da1f06064 (diff) | |
download | vyos-cloud-init-b0ea6e5a2c1c26b8faf1dc8303feebb00344e537.tar.gz vyos-cloud-init-b0ea6e5a2c1c26b8faf1dc8303feebb00344e537.zip |
merge with trunk.
test runs to the point where it did, think I got most of the changes
incorporated.
Diffstat (limited to 'tests/unittests/test_datasource/test_cloudsigma.py')
-rw-r--r-- | tests/unittests/test_datasource/test_cloudsigma.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_datasource/test_cloudsigma.py b/tests/unittests/test_datasource/test_cloudsigma.py index 772d189a..2a42ce0c 100644 --- a/tests/unittests/test_datasource/test_cloudsigma.py +++ b/tests/unittests/test_datasource/test_cloudsigma.py @@ -1,4 +1,5 @@ # coding: utf-8 + import copy from cloudinit.cs_utils import Cepko @@ -6,7 +7,6 @@ from cloudinit.sources import DataSourceCloudSigma from .. import helpers as test_helpers - SERVER_CONTEXT = { "cpu": 1000, "cpus_instead_of_cores": False, |