Merge "Add python 3.7 unit and functional tox jobs"
This commit is contained in:
commit
2cf77492ff
|
@ -271,3 +271,4 @@
|
|||
irrelevant-files: *dsvm-irrelevant-files
|
||||
- os-vif-ovs:
|
||||
irrelevant-files: *dsvm-irrelevant-files
|
||||
- openstack-tox-py37
|
||||
|
|
|
@ -105,13 +105,13 @@ def query_wrapper(ctx, fn, *args, **kwargs):
|
|||
# we won't call into the implementation's comparison routines)
|
||||
# wrapping the sentinel indicating timeout.
|
||||
yield RecordWrapper(ctx, None, context.did_not_respond_sentinel)
|
||||
raise StopIteration
|
||||
return
|
||||
except Exception as e:
|
||||
# Here, we yield a RecordWrapper (no sort_ctx needed since
|
||||
# we won't call into the implementation's comparison routines)
|
||||
# wrapping the exception object indicating failure.
|
||||
yield RecordWrapper(ctx, None, e.__class__(e.args))
|
||||
raise StopIteration
|
||||
return
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
|
|
|
@ -467,7 +467,7 @@ class PatternPropertiesTestCase(APIValidationTestCase):
|
|||
# Note(jrosenboom): This is referencing an internal python error
|
||||
# string, which is no stable interface. We need a patch in the
|
||||
# jsonschema library in order to fix this properly.
|
||||
if sys.version[:3] in ['3.5', '3.6']:
|
||||
if sys.version[:3] in ['3.5', '3.6', '3.7']:
|
||||
detail = "expected string or bytes-like object"
|
||||
else:
|
||||
detail = "expected string or buffer"
|
||||
|
|
|
@ -187,8 +187,8 @@ class CreateInstanceTypeTest(test.TestCase):
|
|||
self.assertInvalidInput('foobar\x00', 64, 1, 120)
|
||||
|
||||
def test_name_with_non_printable_characters(self):
|
||||
# Names cannot contain printable characters
|
||||
self.assertInvalidInput(u'm1.\u0868 #', 64, 1, 120)
|
||||
# Names cannot contain non printable characters
|
||||
self.assertInvalidInput(u'm1.\u0C77 #', 64, 1, 120)
|
||||
|
||||
def test_name_length_checks(self):
|
||||
MAX_LEN = 255
|
||||
|
|
13
tox.ini
13
tox.ini
|
@ -52,6 +52,12 @@ basepython = python3.6
|
|||
commands =
|
||||
{[testenv:py35]commands}
|
||||
|
||||
[testenv:py37]
|
||||
# TODO(efried): Remove this once https://github.com/tox-dev/tox/issues/425 is fixed.
|
||||
basepython = python3.7
|
||||
commands =
|
||||
{[testenv:py35]commands}
|
||||
|
||||
[testenv:pep8]
|
||||
description =
|
||||
Run style checks.
|
||||
|
@ -119,6 +125,13 @@ deps = {[testenv:functional]deps}
|
|||
commands =
|
||||
{[testenv:functional]commands}
|
||||
|
||||
[testenv:functional-py37]
|
||||
basepython = python3.7
|
||||
envdir = {toxworkdir}/py37
|
||||
setenv = {[testenv]setenv}
|
||||
commands =
|
||||
{[testenv:functional]commands}
|
||||
|
||||
[testenv:api-samples]
|
||||
envdir = {toxworkdir}/shared
|
||||
setenv =
|
||||
|
|
Loading…
Reference in New Issue