unwedge the gate

devstack defaults to v3 and makes some janky assumptions in
the generated rc files

Change-Id: I4b0b3eb6ab2aa9be2ac4c2404b2f9655e3ed564e
This commit is contained in:
Steve Martinelli 2015-10-08 02:10:39 -04:00
parent 262af5416b
commit bd14d07809
2 changed files with 3 additions and 1 deletions

View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import os
import uuid import uuid
from functional.tests.volume.v1 import common from functional.tests.volume.v1 import common
@ -25,6 +26,7 @@ class VolumeTests(common.BaseVolumeTests):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
os.environ['OS_VOLUME_API_VERSION'] = '1'
opts = cls.get_show_opts(cls.FIELDS) opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts) raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts)
expected = cls.NAME + '\n' expected = cls.NAME + '\n'

View File

@ -12,7 +12,7 @@ OPENSTACKCLIENT_DIR=$(cd $(dirname "$0") && pwd)
echo "Running openstackclient functional test suite" echo "Running openstackclient functional test suite"
sudo -H -u stack -i <<! sudo -H -u stack -i <<!
source ~stack/devstack/accrc/admin/admin source ~stack/devstack/openrc admin admin
echo 'Running tests with:' echo 'Running tests with:'
env | grep OS_ env | grep OS_
cd ${OPENSTACKCLIENT_DIR} cd ${OPENSTACKCLIENT_DIR}