openstack
/
shade
Code Issues Proposed changes

Fix basepython setting in tox.ini 

Noticed this for real in openstacksdk. This line is causing python3
tests to not run under python3.

Change-Id: I1ac6396a28ae308f778cabd7d5bc399262772d21
This commit is contained in:
Monty Taylor 2017-11-29 09:47:39 -06:00
parent e11ecfaf98
commit 24384e1599
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shade/tests/unit/test_create_server.py
View File

@ -376,7 +376,8 @@ class TestCreateServer(base.RequestsMockTestCase):
Test that a server passed user-data sends it base64 encoded.
"""
user_data = self.getUniqueString('user_data')
user_data_b64 = base64.b64encode(user_data).decode('utf-8')
user_data_b64 = base64.b64encode(
user_data.encode('utf-8')).decode('utf-8')
fake_server = fakes.make_fake_server('1234', '', 'BUILD')
fake_server['user_data'] = user_data

3
tox.ini
View File

@ -5,7 +5,6 @@ skipsdist = True
[testenv]
usedevelop = True
basepython = {env:SHADE_TOX_PYTHON:python2}
passenv = UPPER_CONSTRAINTS_FILE
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv =
@ -20,11 +19,13 @@ commands = stestr run {posargs}
stestr slowest
[testenv:functional]
basepython = {env:SHADE_TOX_PYTHON:python2}
passenv = OS_* SHADE_* UPPER_CONSTRAINTS_FILE
commands = stestr --test-path ./shade/tests/functional run --serial {posargs}
stestr slowest
[testenv:functional-tips]
basepython = {env:SHADE_TOX_PYTHON:python2}
passenv = OS_* SHADE_* UPPER_CONSTRAINTS_FILE
whitelist_externals = bash
commands =