openstack
/
python-manilaclient
Code Issues Proposed changes

Fix gate breakage 

It's no longer allowed to use both localrc and local.conf
so our dsvm jobs were failing very early. See:
http://lists.openstack.org/pipermail/openstack-dev/2017-February/112872.html

Adusts hacking test requirements for PBR issue.

Fix functional tests given server changes fixing bug #1664370.

Partial-Bug: #1668848
Closes-Bug: #1669441

Change-Id: Ie14a48b5f174db29bfeac98b28adeeb19292ac22
This commit is contained in:
Tom Barron 2017-03-02 07:00:05 -05:00
parent e84e2a1f97
commit eb4b7e77ca
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/ci/pre_test_hook.sh
View File

@ -17,11 +17,12 @@
# Run manila's pre_test_hook.sh script first
source $BASE/new/manila/contrib/ci/pre_test_hook.sh True dummy multibackend
localrc_path=$BASE/new/devstack/localrc
localconf=$BASE/new/devstack/local.conf
echo "[[local|localrc]]" >> $localconf
# Set big quota for share networks to avoid limit exceedances
echo "MANILA_OPTGROUP_DEFAULT_quota_share_networks=50" >> $localrc_path
echo "MANILA_OPTGROUP_DEFAULT_quota_share_networks=50" >> $localconf
# Enable and use only v3 of Identity API
echo "IDENTITY_API_VERSION=3" >> $localrc_path
echo "ENABLE_IDENTITY_V2=False" >> $localrc_path
echo "IDENTITY_API_VERSION=3" >> $localconf
echo "ENABLE_IDENTITY_V2=False" >> $localconf

2
manilaclient/tests/functional/test_shares.py
View File

@ -151,7 +151,7 @@ class SharesTestMigration(base.BaseTestCase):
share_type=self.old_type['ID'],
share_network=self.old_share_net['id'],
wait_for_creation=True)
share = self.user_client.get_share(share['id'])
share = self.admin_client.get_share(share['id'])
pools = self.admin_client.pool_list(detail=True)

9
manilaclient/tests/functional/test_shares_listing.py
View File

@ -61,9 +61,8 @@ class SharesListReadOnlyTest(base.BaseTestCase):
def test_shares_list_filter_by_project_id(self, role):
self.clients[role].manila('list', params='--project-id fake')
@ddt.data('admin', 'user')
def test_shares_list_filter_by_host(self, role):
self.clients[role].manila('list', params='--host fake')
def test_shares_list_filter_by_host(self):
self.clients['admin'].manila('list', params='--host fake')
@ddt.data('admin', 'user')
def test_shares_list_with_limit_and_offset(self, role):
@ -226,10 +225,6 @@ class SharesListReadWriteTest(base.BaseTestCase):
CONF.share_network)['id']
self._list_shares({'share_network': share_network_id})
def test_list_shares_by_host(self):
get = self.user_client.get_share(self.private_share['id'])
self._list_shares({'host': get['host']})
@ddt.data(
{'limit': 1},
{'limit': 2},

2
test-requirements.txt
View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
# hacking should be first
hacking<0.11,>=0.10.2 # Apache-2.0
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
coverage>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT