From 81e50b746b4d35f98b0f86c46c6b9ec3c4ee6442 Mon Sep 17 00:00:00 2001
From: Jian Wen <jian.wen@canonical.com>
Date: Thu, 16 May 2013 01:45:57 +0800
Subject: libvirt: Catch VIR_ERR_NO_DOMAIN in list_instances

Commit 25f50d9a didn't catch the exact exception for
looking up deleted domain.

Partly fixes LP Bug #1032741.

Change-Id: I6c6f7d8a736c833488b6cb8e00530dc4138f1424
---
 nova/tests/test_libvirt.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index b482ea8c9..93bd4b450 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1072,6 +1072,10 @@ class LibvirtConnTestCase(test.TestCase):
         libvirt_driver.LibvirtDriver._conn.listDomainsID = lambda: [0, 1]
         libvirt_driver.LibvirtDriver._conn.listDefinedDomains = lambda: []
 
+        self.mox.StubOutWithMock(libvirt.libvirtError, "get_error_code")
+        libvirt.libvirtError.get_error_code().AndReturn(
+            libvirt.VIR_ERR_NO_DOMAIN)
+
         self.mox.ReplayAll()
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
         instances = conn.list_instances()
-- 
cgit