summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-15 20:39:32 +0000
committerGerrit Code Review <review@openstack.org>2013-06-15 20:39:32 +0000
commitbdfd3fef2d8de4a2a6aafcb42f41aa095e94bcab (patch)
tree4a272b990eeee8a839b26c2d800ed95ff351fccf /nova/tests
parent3641d0f3f307a086e2a0c340460ce0720f577882 (diff)
parent3ba0c171c0b6f3516662bc0ab660b14cd6d34d8a (diff)
downloadnova-bdfd3fef2d8de4a2a6aafcb42f41aa095e94bcab.tar.gz
nova-bdfd3fef2d8de4a2a6aafcb42f41aa095e94bcab.tar.xz
nova-bdfd3fef2d8de4a2a6aafcb42f41aa095e94bcab.zip
Merge "Don't make nova-compute depend on iSCSI"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/virt/libvirt/test_libvirt.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index 16417b8bb..cd5dc6f4d 100644
--- a/nova/tests/virt/libvirt/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -4554,6 +4554,17 @@ class LibvirtUtilsTestCase(test.TestCase):
result = libvirt_utils.get_iscsi_initiator()
self.assertEqual(initiator, result)
+ def test_get_missing_iscsi_initiator(self):
+ self.mox.StubOutWithMock(utils, 'execute')
+ file_path = '/etc/iscsi/initiatorname.iscsi'
+ utils.execute('cat', file_path, run_as_root=True).AndRaise(
+ exception.FileNotFound(file_path=file_path)
+ )
+ # Start test
+ self.mox.ReplayAll()
+ result = libvirt_utils.get_iscsi_initiator()
+ self.assertIsNone(result)
+
def test_create_image(self):
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('qemu-img', 'create', '-f', 'raw',