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 | 30178e219cce007505d42b49ceb7499364b435de (patch) | |
| tree | 1ec50e5f8c07ab1c7b4e206a5d0c7dca0858b640 /tests/unittests/test_datasource/test_cloudstack.py | |
| parent | c706c3a4df9b538864738b804013fb36571efa49 (diff) | |
| parent | e56a88a9a52985e5bb45394d150340c1a452f7ac (diff) | |
| download | cloud-init-30178e219cce007505d42b49ceb7499364b435de.tar.gz | |
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_cloudstack.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_cloudstack.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/unittests/test_datasource/test_cloudstack.py b/tests/unittests/test_datasource/test_cloudstack.py index 974b3704..b1aab17b 100644 --- a/tests/unittests/test_datasource/test_cloudstack.py +++ b/tests/unittests/test_datasource/test_cloudstack.py @@ -1,16 +1,7 @@ from cloudinit import helpers from cloudinit.sources.DataSourceCloudStack import DataSourceCloudStack -from ..helpers import TestCase - -try: - from unittest import mock -except ImportError: - import mock -try: - from contextlib import ExitStack -except ImportError: - from contextlib2 import ExitStack +from ..helpers import TestCase, mock, ExitStack class TestCloudStackPasswordFetching(TestCase): |