openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Add functional tests launcher for py3 env"

This commit is contained in:
Jenkins 2016-01-16 03:56:26 +00:00 committed by Gerrit Code Review
parent c819132c4c 426f6afb3c
commit 6c37270c4e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/tests/functional/api/test_servers.py
View File

@ -22,7 +22,7 @@ class TestServersAPI(base.ClientTestBase):
server_name, self.image, self.flavor)
self.addCleanup(initial_server.delete)
for x in xrange(60):
for x in range(60):
server = self.client.servers.get(initial_server)
if server.status == "ACTIVE":
break

2
novaclient/tests/functional/hooks/post_test_hook.sh
View File

@ -43,7 +43,7 @@ cd $NOVACLIENT_DIR
echo "Running novaclient functional test suite"
set +e
# Preserve env for OS_ credentials
sudo -E -H -u jenkins tox -efunctional
sudo -E -H -u jenkins tox -e ${TOX_ENV:-functional}
EXIT_CODE=$?
set -e

7
tox.ini
View File

@ -35,6 +35,13 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
[testenv:functional]
basepython = python2.7
setenv =
OS_TEST_PATH = ./novaclient/tests/functional
commands = python setup.py testr --testr-args='--concurrency=1 {posargs}'
[testenv:functional-py34]
basepython = python3.4
setenv =
OS_TEST_PATH = ./novaclient/tests/functional
commands = python setup.py testr --testr-args='--concurrency=1 {posargs}'