Fix backup unit tests imports for os-brick
This patch updates the previous fix for the new location for the FakeConnector. The imports were broken. Change-Id: I9e6a15ae4cb33d18c622d0d010722ae3aea431f7 Partial-Bug: 1618697
This commit is contained in:
parent
9cfceacab7
commit
859653a4ec
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user