diff options
| author | Richard Theis <rtheis@us.ibm.com> | 2015-12-23 12:48:45 -0600 |
|---|---|---|
| committer | Steve Martinelli <stevemar@ca.ibm.com> | 2016-04-21 02:22:42 -0400 |
| commit | 9df7e9cdcce3eee027a2f597e39c0ef870bc23e6 (patch) | |
| tree | 5c637305c03372cef05464621a12d755d2783064 | |
| parent | 4f52b5e8f19561a4c49089931876701800150dab (diff) | |
| download | python-openstackclient-9df7e9cdcce3eee027a2f597e39c0ef870bc23e6.tar.gz | |
Fix stable/liberty gate
**This patch is a merge of 2 patches that needed to be backported**
unwedge the gate
devstack defaults to v3 and makes some janky assumptions in
the generated rc files
(cherry picked from commit bd14d078098eb2055c0dae784de892b0b1346ed5)
Add all regions to cloud configuration
OCC now requires all regions to be listed in the cloud
configuration. Update the shell unit tests to list all
of the regions being tested.
Change-Id: Ic7300d1f708339701b5daadbf2c4769b239a2adb
(cherry picked from commit d1311f9742ad93198b9ca72f47d51710e17ced38)
| -rw-r--r-- | functional/tests/volume/v1/test_volume.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/test_shell.py | 2 | ||||
| -rwxr-xr-x | post_test_hook.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py index 596b8217..874be6e1 100644 --- a/functional/tests/volume/v1/test_volume.py +++ b/functional/tests/volume/v1/test_volume.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +import os import uuid from functional.tests.volume.v1 import common @@ -25,6 +26,7 @@ class VolumeTests(common.BaseVolumeTests): @classmethod def setUpClass(cls): + os.environ['OS_VOLUME_API_VERSION'] = '1' opts = cls.get_show_opts(cls.FIELDS) raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts) expected = cls.NAME + '\n' diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index c548d890..c4546d89 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -76,7 +76,7 @@ CLOUD_2 = { 'project_name': 'heart-o-gold', 'username': 'zaphod', }, - 'region_name': 'occ-cloud', + 'region_name': 'occ-cloud,krikkit,occ-env', 'log_file': '/tmp/test_log_file', 'log_level': 'debug', } diff --git a/post_test_hook.sh b/post_test_hook.sh index 4c35b520..7bb036f9 100755 --- a/post_test_hook.sh +++ b/post_test_hook.sh @@ -12,7 +12,7 @@ OPENSTACKCLIENT_DIR=$(cd $(dirname "$0") && pwd) echo "Running openstackclient functional test suite" sudo -H -u stack -i <<! -source ~stack/devstack/accrc/admin/admin +source ~stack/devstack/openrc admin admin echo 'Running tests with:' env | grep OS_ cd ${OPENSTACKCLIENT_DIR} |