← Back to branch summary

~rackspace-titan/nova/openstack-api-markers

« back to all changes in this revision

Viewing changes to nova/tests/test_volume.py

  • Committer: Naveed Massjouni
  • Date: 2011-03-24 16:04:58 UTC
  • mfrom: (784.1.80 nova)
  • Revision ID: naveedm9@gmail.com-20110324160458-09aw4v7reem37sxa
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_volume.py
336
336
        self.mox.StubOutWithMock(self.volume.driver, '_execute')
337
337
        for i in volume_id_list:
338
338
            tid = db.volume_get_iscsi_target_num(self.context, i)
339
 
            self.volume.driver._execute("sudo ietadm --op show --tid=%(tid)d"
340
 
                                        % locals())
 
339
            self.volume.driver._execute("sudo", "ietadm", "--op", "show",
 
340
                                        "--tid=%(tid)d" % locals())
341
341
 
342
342
        self.stream.truncate(0)
343
343
        self.mox.ReplayAll()
355
355
        # the first vblade process isn't running
356
356
        tid = db.volume_get_iscsi_target_num(self.context, volume_id_list[0])
357
357
        self.mox.StubOutWithMock(self.volume.driver, '_execute')
358
 
        self.volume.driver._execute("sudo ietadm --op show --tid=%(tid)d"
359
 
            % locals()).AndRaise(exception.ProcessExecutionError())
 
358
        self.volume.driver._execute("sudo", "ietadm", "--op", "show",
 
359
                                    "--tid=%(tid)d" % locals()
 
360
                                 ).AndRaise(exception.ProcessExecutionError())
360
361
 
361
362
        self.mox.ReplayAll()
362
363
        self.assertRaises(exception.ProcessExecutionError,