diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-10-20 14:27:33 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-10-20 14:27:33 -0400 |
| commit | dff72e0f5ee4718416ab7d1c212eb480c6208218 (patch) | |
| tree | e077449af4b959b0392e8712454884e1aff3bdcf | |
| parent | cff60d55fcdffd29bd15ad199f3693aeeb2f814b (diff) | |
| parent | 36bc6de57a2c9be1efe9ae7e9ebaf7fa9023d230 (diff) | |
| download | vyos-cloud-init-dff72e0f5ee4718416ab7d1c212eb480c6208218.tar.gz vyos-cloud-init-dff72e0f5ee4718416ab7d1c212eb480c6208218.zip | |
fix 'make test' failure.
| -rw-r--r-- | tests/unittests/test_datasource/test_openstack.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py index 7b4e651a..8becbdd2 100644 --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py @@ -318,7 +318,7 @@ class TestOpenStackDataSource(test_helpers.HttprettyTestCase): self.assertIsNone(ds_os.version) -class TestVendorDataLoading(unittest.TestCase): +class TestVendorDataLoading(test_helpers.TestCase): def cvj(self, data): return openstack.convert_vendordata_json(data) diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index fbdb7b3f..35cc1f43 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -182,6 +182,12 @@ NETWORKING=yes spec=False, passthrough=False) load_mock = self.mocker.replace(util.load_file, spec=False, passthrough=False) + subp_mock = self.mocker.replace(util.subp, + spec=False, passthrough=False) + + subp_mock(['ifconfig', '-a']) + self.mocker.count(0, None) + self.mocker.result(('vtnet0', '')) exists_mock(mocker.ARGS) self.mocker.count(0, None) @@ -190,6 +196,7 @@ NETWORKING=yes write_bufs = {} read_bufs = { '/etc/rc.conf': '', + '/etc/resolv.conf': '', } def replace_write(filename, content, mode=0644, omode="wb"): |