From 859653a4ecf1dd24d22bc9f20bf002c994a2be7e Mon Sep 17 00:00:00 2001 From: "Walter A. Boring IV" Date: Thu, 1 Sep 2016 15:35:04 -0700 Subject: [PATCH] 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 --- cinder/tests/unit/backup/test_backup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cinder/tests/unit/backup/test_backup.py b/cinder/tests/unit/backup/test_backup.py index 03fcc81e2..61ac64dc9 100644 --- a/cinder/tests/unit/backup/test_backup.py +++ b/cinder/tests/unit/backup/test_backup.py @@ -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,