openstack/cinder
Code Issues Proposed changes

Merge "Fix backup unit test with new os-brick"

Browse Source
This commit is contained in:
Jenkins 2016-09-01 20:50:15 +00:00 committed by Gerrit Code Review
commit 807c00f469
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/tests/unit/backup/test_backup.py
View File

@ -640,10 +640,18 @@ class BackupTestCase(BaseBackupTest):
'secure_enabled': False,
'is_snapshot': True, }
# TODO(walter-boring) This is to account for the missing FakeConnector
# in os-brick 1.6.0 and >
connector = None
if hasattr(os_brick.initiator.connector, 'FakeConnector'):
connector = os_brick.initiator.connector.FakeConnector(None)
else:
connector = os_brick.initiator.connectors.fake.FakeConnector(None)
attach_info = {
'device': {'path': '/dev/null'},
'conn': {'data': {}},
'connector': os_brick.initiator.connector.FakeConnector(None)}
'connector': connector}
mock_detach_snapshot = self.mock_object(driver.BaseVD,
'_detach_snapshot')
mock_attach_snapshot = self.mock_object(driver.BaseVD,