openstack/cinder
Code Issues Proposed changes

eliminate the need for hplefthandclient in tests

Browse Source 
In order to eliminate the need to have the hplefthandclient in the
global-requirements project, we need to remove the hplefthandclient
from being imported in all HP LeftHand driver unit tests in cinder.

Change-Id: I4009ea17b507b1deb2a567dd420f309e15aaf92d
Closes-Bug: #1316824
This commit is contained in:
Mark Sturdevant 2014-05-12 14:27:48 -07:00
parent 432720e99f
commit f2a6e77bc7
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cinder/tests/fake_hp_lefthand_client.py Normal file
View File

@ -0,0 +1,27 @@
# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
"""Fake HP client for testing LeftHand without installing the client."""
import mock
import sys
from cinder.tests import fake_hp_client_exceptions as hpexceptions
hplefthand = mock.Mock()
hplefthand.version = "3.0.0"
hplefthand.exceptions = hpexceptions
sys.modules['hplefthandclient'] = hplefthand

6
cinder/tests/test_hplefthand.py
View File

@ -16,17 +16,19 @@
"""Unit tests for OpenStack Cinder volume drivers."""
import mock
from hplefthandclient import exceptions as hpexceptions
from cinder import context
from cinder import exception
from cinder.openstack.common import log as logging
from cinder import test
from cinder import units
from cinder.tests import fake_hp_lefthand_client as hplefthandclient
from cinder.volume.drivers.san.hp import hp_lefthand_iscsi
from cinder.volume.drivers.san.hp import hp_lefthand_rest_proxy
from cinder.volume import volume_types
hpexceptions = hplefthandclient.hpexceptions
LOG = logging.getLogger(__name__)

1
test-requirements.txt
View File

@ -3,7 +3,6 @@ hacking>=0.8.0,<0.9
coverage>=3.6
discover
fixtures>=0.3.14
hplefthandclient>=1.0.0,<2.0.0
mock>=1.0
mox>=0.5.3
MySQL-python