openstack
/
python-manilaclient
Code Issues Proposed changes

Fix post_test_hook and update test-requirements 

Our gate jobs are broken in two places:

    - latest mock lib does not work on py26;
    - post_test_hook.sh is not compatible with devstack anymore after change to devstack [1]

So, fix post_test_hook.sh and set proper version to mock lib.

[1]: I613f1bdc6673f0c4bfe29aaab7b514348a617a8c

Closes-Bug: #1474293
Closes-Bug: #1474261
Closes-Bug: #1474744

Change-Id: Ia849a06275e738078dc4543680d499c6149117d5
This commit is contained in:
Julia Varlamova 2015-07-14 06:02:15 -04:00
parent 4f25278e61
commit 2a4f79cc0d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/post_test_hook.sh Normal file → Executable file
View File

@ -31,12 +31,14 @@ source $BASE/new/devstack/functions
# Set options to config client.
source $BASE/new/devstack/accrc/demo/demo
export OS_TENANT_NAME=${OS_PROJECT_NAME:-$OS_TENANT_NAME}
iniset $MANILACLIENT_CONF DEFAULT username $OS_USERNAME
iniset $MANILACLIENT_CONF DEFAULT tenant_name $OS_TENANT_NAME
iniset $MANILACLIENT_CONF DEFAULT password $OS_PASSWORD
iniset $MANILACLIENT_CONF DEFAULT auth_url $OS_AUTH_URL
source $BASE/new/devstack/accrc/demo/admin
export OS_TENANT_NAME=${OS_PROJECT_NAME:-$OS_TENANT_NAME}
iniset $MANILACLIENT_CONF DEFAULT admin_username $OS_USERNAME
iniset $MANILACLIENT_CONF DEFAULT admin_tenant_name $OS_TENANT_NAME
iniset $MANILACLIENT_CONF DEFAULT admin_password $OS_PASSWORD

3
test-requirements.txt
View File

@ -9,7 +9,8 @@ coverage>=3.6
ddt>=0.7.0
discover
fixtures>=1.3.1
mock>=1.0
mock>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
ordereddict
oslosphinx>=2.5.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2