openstack
/
deb-cinder
Code Issues Proposed changes

Merge "Fix backup unit tests imports for os-brick"

This commit is contained in:
Jenkins 2016-09-02 00:09:59 +00:00 committed by Gerrit Code Review
parent 62e9f6e747 859653a4ec
commit b4ef69d8ff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import tempfile
import uuid
import mock
import os_brick
from os_brick.initiator import connector
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_utils import importutils
@ -642,16 +642,16 @@ class BackupTestCase(BaseBackupTest):
# 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)
if hasattr(connector, 'FakeConnector'):
conn = connector.FakeConnector(None)
else:
connector = os_brick.initiator.connectors.fake.FakeConnector(None)
from os_brick.initiator.connectors import fake
conn = fake.FakeConnector(None)
attach_info = {
'device': {'path': '/dev/null'},
'conn': {'data': {}},
'connector': connector}
'connector': conn}
mock_detach_snapshot = self.mock_object(driver.BaseVD,
'_detach_snapshot')
mock_attach_snapshot = self.mock_object(driver.BaseVD,