openstack
/
nova
Code Issues Proposed changes

Merge "Corrects the type of a base64 encoded string"

This commit is contained in:
Jenkins 2016-12-13 23:03:13 +00:00 committed by Gerrit Code Review
parent e713ab8cda a2d7ebd39b
commit f60ef0dac7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/functional/api_sample_tests/test_servers.py
View File

@ -16,6 +16,8 @@
import base64
import time
import six
from nova.api.openstack import api_version_request as avr
from nova.tests.functional.api_sample_tests import api_sample_base
from nova.tests.unit.api.openstack import fakes
@ -26,7 +28,7 @@ class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21):
microversion = None
sample_dir = 'servers'
user_data_contents = '#!/bin/bash\n/bin/su\necho "I am in you!"\n'
user_data_contents = six.b('#!/bin/bash\n/bin/su\necho "I am in you!"\n')
user_data = base64.b64encode(user_data_contents)
common_req_names = [

4
tox.ini
View File

@ -47,8 +47,8 @@ commands =
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
[testenv:functional]
# TODO(melwitt): This can be removed when functional tests can be run
# with python 3.x
# TODO(melwitt): This can be removed when functional tests are gating with
# python 3.x
basepython = python2.7
usedevelop = True
setenv = VIRTUAL_ENV={envdir}