Joshua Harlow has proposed merging lp:~harlowja/cloud-init/test-fixups into
lp:cloud-init.
Requested reviews:
cloud init development team (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/test-fixups/+merge/238042
Fix some of the erroring out test cases
--
https://code.launchpad.net/~harlowja/cloud-init/test-fixups/+merge/238042
Your team cloud init development team is requested to review the proposed merge
of lp:~harlowja/cloud-init/test-fixups into lp:cloud-init.
=== modified file 'tests/unittests/test_datasource/test_openstack.py'
--- tests/unittests/test_datasource/test_openstack.py 2014-09-11 01:17:40 +0000
+++ tests/unittests/test_datasource/test_openstack.py 2014-10-11 01:57:29 +0000
@@ -318,7 +318,7 @@
self.assertIsNone(ds_os.version)
-class TestVendorDataLoading(unittest.TestCase):
+class TestVendorDataLoading(test_helpers.TestCase):
def cvj(self, data):
return openstack.convert_vendordata_json(data)
=== modified file 'tests/unittests/test_distros/test_netconfig.py'
--- tests/unittests/test_distros/test_netconfig.py 2014-10-02 20:45:08 +0000
+++ tests/unittests/test_distros/test_netconfig.py 2014-10-11 01:57:29 +0000
@@ -182,6 +182,12 @@
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 @@
write_bufs = {}
read_bufs = {
'/etc/rc.conf': '',
+ '/etc/resolv.conf': '',
}
def replace_write(filename, content, mode=0644, omode="wb"):
_______________________________________________
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
