x/python-ganttclient
Code Issues Proposed changes

Adjust test cases.

Browse Source
This commit is contained in:
Soren Hansen
2011-03-17 21:39:55 +01:00
parent 9d5b9a3c6e
commit dbe18ea6d0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_volume.py
View File

@@ -336,8 +336,8 @@ class ISCSITestCase(DriverTestCase):
self.mox.StubOutWithMock(self.volume.driver, '_execute') self.mox.StubOutWithMock(self.volume.driver, '_execute')
for i in volume_id_list: for i in volume_id_list:
tid = db.volume_get_iscsi_target_num(self.context, i) tid = db.volume_get_iscsi_target_num(self.context, i)
self.volume.driver._execute("sudo ietadm --op show --tid=%(tid)d" self.volume.driver._execute("sudo", "ietadm", "--op", "show",
% locals()) "--tid=%(tid)d" % locals())
self.stream.truncate(0) self.stream.truncate(0)
self.mox.ReplayAll() self.mox.ReplayAll()
@@ -355,8 +355,9 @@ class ISCSITestCase(DriverTestCase):
# the first vblade process isn't running # the first vblade process isn't running
tid = db.volume_get_iscsi_target_num(self.context, volume_id_list[0]) tid = db.volume_get_iscsi_target_num(self.context, volume_id_list[0])
self.mox.StubOutWithMock(self.volume.driver, '_execute') self.mox.StubOutWithMock(self.volume.driver, '_execute')
self.volume.driver._execute("sudo ietadm --op show --tid=%(tid)d" self.volume.driver._execute("sudo", "ietadm", "--op", "show",
% locals()).AndRaise(exception.ProcessExecutionError()) "--tid=%(tid)d" % locals()
).AndRaise(exception.ProcessExecutionError())
self.mox.ReplayAll() self.mox.ReplayAll()
self.assertRaises(exception.ProcessExecutionError, self.assertRaises(exception.ProcessExecutionError,