diff --git a/nova/tests/unit/virt/lxd/test_driver.py b/nova/tests/unit/virt/lxd/test_driver.py index 670030f1..91b936e8 100644 --- a/nova/tests/unit/virt/lxd/test_driver.py +++ b/nova/tests/unit/virt/lxd/test_driver.py @@ -682,13 +682,15 @@ class LXDDriverTest(test.NoDBTestCase): self.client.containers.get.assert_called_once_with(instance.name) + @mock.patch('nova.virt.lxd.common.is_snap_lxd') @mock.patch('nova.virt.lxd.driver.network') @mock.patch('pwd.getpwuid', mock.Mock(return_value=mock.Mock(pw_uid=1234))) @mock.patch('os.getuid', mock.Mock()) @mock.patch('os.path.exists', mock.Mock(return_value=True)) @mock.patch('six.moves.builtins.open') @mock.patch.object(driver.utils, 'execute') - def test_get_console_output(self, execute, _open, _): + def test_get_console_output(self, execute, _open, _, is_snap_lxd): + is_snap_lxd.return_value = False ctx = context.get_admin_context() instance = fake_instance.fake_instance_obj( ctx, name='test', memory_mb=0) diff --git a/nova/tests/unit/virt/lxd/test_flavor.py b/nova/tests/unit/virt/lxd/test_flavor.py index 59a683b5..8b620611 100644 --- a/nova/tests/unit/virt/lxd/test_flavor.py +++ b/nova/tests/unit/virt/lxd/test_flavor.py @@ -48,6 +48,11 @@ class ToProfileTest(test.NoDBTestCase): self.CONF2.lxd.pool = None self.CONF2.lxd.root_dir = '' + is_snap_lxd_patch = mock.patch('nova.virt.lxd.common.is_snap_lxd') + self.patchers.append(is_snap_lxd_patch) + self.is_snap_lxd = is_snap_lxd_patch.start() + self.is_snap_lxd.return_value = False + def tearDown(self): super(ToProfileTest, self).tearDown() for patcher in self.patchers: diff --git a/nova/virt/lxd/driver.py b/nova/virt/lxd/driver.py index c63e69aa..67c65dfb 100644 --- a/nova/virt/lxd/driver.py +++ b/nova/virt/lxd/driver.py @@ -479,7 +479,7 @@ class LXDDriver(driver.ComputeDriver): information. """ - def get_info(self, instance): + def get_info(self, instance, use_cache=True): """Return an InstanceInfo object for the instance.""" try: container = self.client.containers.get(instance.name) diff --git a/tox.ini b/tox.ini index 8bfc113a..16d2a0a7 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = LC_ALL=en_US.utf-8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - -egit+https://github.com/openstack/nova.git#egg=nova + -egit+https://github.com/openstack/nova.git@stable/stein#egg=nova whitelist_externals = bash find