fix utils.execute retries for osx
also some minor misc cleanups
This commit is contained in:
@@ -356,8 +356,8 @@ class ISCSITestCase(DriverTestCase):
|
|||||||
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",
|
self.volume.driver._execute("sudo", "ietadm", "--op", "show",
|
||||||
"--tid=%(tid)d" % locals()
|
"--tid=%(tid)d" % locals()).AndRaise(
|
||||||
).AndRaise(exception.ProcessExecutionError())
|
exception.ProcessExecutionError())
|
||||||
|
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
self.assertRaises(exception.ProcessExecutionError,
|
self.assertRaises(exception.ProcessExecutionError,
|
||||||
|
Reference in New Issue
Block a user