diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-05-27 14:32:43 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-05-27 14:32:43 -0400 |
| commit | 91734552a2d338938ed0e3aa4885f77b99409ead (patch) | |
| tree | 0ef5d0ac1cef84bc332f42c4de375dce7e0b44b3 | |
| parent | 8a148ed934156c63a76a28c9d3a33278e52d71d1 (diff) | |
| download | vyos-cloud-init-91734552a2d338938ed0e3aa4885f77b99409ead.tar.gz vyos-cloud-init-91734552a2d338938ed0e3aa4885f77b99409ead.zip | |
fix pyflakes and flake8
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 3 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_smartos.py | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index e9ff1235..f5820696 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -722,8 +722,7 @@ def convert_smartos_network_data(network_data=None): if k in valid_keys['physical']} cfg.update({ 'type': 'physical', - 'name': nic['interface'] - }) + 'name': nic['interface']}) if 'mac' in nic: cfg.update({'mac_address': nic['mac']}) diff --git a/tests/unittests/test_datasource/test_smartos.py b/tests/unittests/test_datasource/test_smartos.py index 56d85f99..ae45513d 100644 --- a/tests/unittests/test_datasource/test_smartos.py +++ b/tests/unittests/test_datasource/test_smartos.py @@ -40,9 +40,8 @@ import six from cloudinit import helpers as c_helpers from cloudinit.sources import DataSourceSmartOS from cloudinit.util import b64e -from cloudinit import util -from ..helpers import mock, TestCase, FilesystemMockingTestCase +from ..helpers import mock, FilesystemMockingTestCase SDC_NICS = json.loads(""" [ @@ -111,7 +110,7 @@ class PsuedoJoyentClient(object): data = MOCK_RETURNS.copy() self.data = data return - + def get(self, key, default=None, strip=False): if key in self.data: r = self.data[key] @@ -169,10 +168,6 @@ class TestSmartOSDataSource(FilesystemMockingTestCase): return DataSourceSmartOS.DataSourceSmartOS( sys_cfg, distro=None, paths=self.paths) - - def test_it_got_here(self): - dsrc = self._get_ds() - ret = dsrc.get_data() def test_no_base64(self): ds_cfg = {'no_base64_decode': ['test_var1'], 'all_base': True} @@ -379,7 +374,6 @@ class TestSmartOSDataSource(FilesystemMockingTestCase): mydscfg['disk_aliases']['FOO']) - class TestJoyentMetadataClient(FilesystemMockingTestCase): def setUp(self): |