Fix unit tests on Python 3.8.

pull/52191/head
Matt Clay 6 years ago
parent 563725ba98
commit 467d2ebecd

@ -261,6 +261,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, 8):
error_text = "Unable to parse output as XML, see 'raw' output. None (line 0)"
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)"

@ -14,6 +14,7 @@
import platform import platform
import pytest import pytest
import sys
from ansible.module_utils import distro from ansible.module_utils import distro
from ansible.module_utils.common.sys_info import (get_distribution, get_distribution_version, from ansible.module_utils.common.sys_info import (get_distribution, get_distribution_version,
@ -40,13 +41,11 @@ class TestDistro():
# distro result is what we expect and special cased. # distro result is what we expect and special cased.
class TestDistroCompat(): class TestDistroCompat():
'''Verify that distro.linux_distribution matches plain platform.linux_distribution''' '''Verify that distro.linux_distribution matches plain platform.linux_distribution'''
@pytest.mark.skipif(sys.version_info >= (3, 8), reason="Python 3.8 and later do not have platform.linux_distribution().")
_platform_supported_dists = platform._supported_dists
def test_linux_distribution(self): def test_linux_distribution(self):
distro_linux_dist = (get_distribution(), get_distribution_version(), get_distribution_codename()) distro_linux_dist = (get_distribution(), get_distribution_version(), get_distribution_codename())
platform_linux_dist = platform.linux_distribution(supported_dists=self._platform_supported_dists) platform_linux_dist = platform.linux_distribution()
assert isinstance(distro_linux_dist, type(platform_linux_dist)), \ assert isinstance(distro_linux_dist, type(platform_linux_dist)), \
'linux_distribution() returned type (%s) which is different from platform.linux_distribution type (%s)' % \ 'linux_distribution() returned type (%s) which is different from platform.linux_distribution type (%s)' % \

Loading…
Cancel
Save