1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Add Python 3.7 to CI unit test matrix. (#34680)

* Add Python 3.7 to CI unit test matrix.
* Fix `os.errno` reference to be `errno`.
* Update test_aci unit test for Python 3.7.
This commit is contained in:
Matt Clay 2018-01-10 00:57:11 -08:00 committed by GitHub
parent f2037bb629
commit 30093dc4ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions

View file

@ -14,6 +14,7 @@ matrix:
- env: T=units/2.7 - env: T=units/2.7
- env: T=units/3.5 - env: T=units/3.5
- env: T=units/3.6 - env: T=units/3.6
- env: T=units/3.7
- env: T=windows/1 - env: T=windows/1
- env: T=windows/2 - env: T=windows/2

View file

@ -229,6 +229,8 @@ class AciRest(unittest.TestCase):
error_text = to_native(u"Unable to parse output as XML, see 'raw' output. None (line 0)", errors='surrogate_or_strict') error_text = to_native(u"Unable to parse output as XML, see 'raw' output. None (line 0)", errors='surrogate_or_strict')
elif PY2: elif PY2:
error_text = "Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (line 1)" error_text = "Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (line 1)"
elif sys.version_info >= (3, 7):
error_text = to_native(u"Unable to parse output as XML, see 'raw' output. None (line 0)", errors='surrogate_or_strict')
else: else:
error_text = "Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (<string>, line 1)" error_text = "Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (<string>, line 1)"

View file

@ -1,3 +1,4 @@
import errno
import os import os
import time import time
import mock import mock
@ -64,7 +65,7 @@ def placeboify(request, monkeypatch):
# make sure the directory for placebo test recordings is available # make sure the directory for placebo test recordings is available
os.makedirs(recordings_path) os.makedirs(recordings_path)
except OSError as e: except OSError as e:
if e.errno != os.errno.EEXIST: if e.errno != errno.EEXIST:
raise raise
pill = placebo.attach(session, data_path=recordings_path) pill = placebo.attach(session, data_path=recordings_path)