summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-01 00:22:20 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-01 00:22:20 -0500
commitc430ef68db729657f0ba9531301d63f31ac6c54c (patch)
tree387daf14689f29d4e2465de2b6e94aabb4cc299d /tests
parentaf5d2a102c029da4b853a3bc42a6e23ce3a40fe6 (diff)
parent14915526ca67bbf7842028d48170015b85f87469 (diff)
downloadvyos-cloud-init-c430ef68db729657f0ba9531301d63f31ac6c54c.tar.gz
vyos-cloud-init-c430ef68db729657f0ba9531301d63f31ac6c54c.zip
merge with trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/test_handler/test_handler_lxd.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/unittests/test_handler/test_handler_lxd.py b/tests/unittests/test_handler/test_handler_lxd.py
index 4d858b8f..65794a41 100644
--- a/tests/unittests/test_handler/test_handler_lxd.py
+++ b/tests/unittests/test_handler/test_handler_lxd.py
@@ -43,9 +43,10 @@ class TestLxd(t_help.TestCase):
self.assertTrue(mock_util.which.called)
init_call = mock_util.subp.call_args_list[0][0][0]
self.assertEquals(init_call,
- ['lxd', 'init', '--auto', '--network-address',
- '0.0.0.0', '--storage-backend', 'zfs',
- '--storage-pool', 'poolname'])
+ ['lxd', 'init', '--auto',
+ '--network-address=0.0.0.0',
+ '--storage-backend=zfs',
+ '--storage-pool=poolname'])
@mock.patch("cloudinit.config.cc_lxd.util")
def test_lxd_install(self, mock_util):
@@ -55,4 +56,4 @@ class TestLxd(t_help.TestCase):
cc_lxd.handle('cc_lxd', self.lxd_cfg, cc, LOG, [])
self.assertTrue(cc.distro.install_packages.called)
install_pkg = cc.distro.install_packages.call_args_list[0][0][0]
- self.assertEquals(install_pkg, ('lxd',))
+ self.assertEquals(sorted(install_pkg), ['lxd', 'zfs'])