cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update aci tests for new messages from lxml-4.0+

Browse source 
(cherry picked from commit 1fa3fb45bc)
This commit is contained in:
Toshio Kuratomi 2017-09-17 16:48:49 -07:00
parent bdce5d2fe0
commit 4ea99a4cbe
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/units/module_utils/test_aci.py
View file

@ -22,6 +22,8 @@ import sys
from ansible.compat.tests import unittest from ansible.compat.tests import unittest
from ansible.module_utils.aci import aci_response_json, aci_response_xml from ansible.module_utils.aci import aci_response_json, aci_response_xml
from ansible.module_utils.six import PY2, PY3
from ansible.module_utils._text import to_native
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
@ -201,7 +203,7 @@ class AciRest(unittest.TestCase):
def test_empty_response(self): def test_empty_response(self):
self.maxDiffi = None self.maxDiffi = None
if sys.version_info < (3, 0): if PY2:
expected_json_result = { expected_json_result = {
'error_code': -1, 'error_code': -1,
'error_text': "Unable to parse output as JSON, see 'raw' output. No JSON object could be decoded", 'error_text': "Unable to parse output as JSON, see 'raw' output. No JSON object could be decoded",
@ -231,18 +233,24 @@ class AciRest(unittest.TestCase):
'raw': '', 'raw': '',
} }
elif sys.version_info < (3, 0): elif etree.LXML_VERSION < (4, 0, 0, 0):
error_text = to_native(u"Unable to parse output as XML, see 'raw' output. None (line 0)", errors='surrogate_or_strict')
expected_xml_result = { expected_xml_result = {
'error_code': -1, 'error_code': -1,
'error_text': "Unable to parse output as XML, see 'raw' output. None (line 0)", 'error_text': error_text,
'raw': '', 'raw': '',
} }
else: else:
if PY3:
error_text = u"Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (<string>, line 1)"
else:
error_text = "Unable to parse output as XML, see 'raw' output. Document is empty, line 1, column 1 (line 1)"
expected_xml_result = { expected_xml_result = {
u'error_code': -1, 'error_code': -1,
u'error_text': u"Unable to parse output as XML, see 'raw' output. None (line 0)", 'error_text': error_text,
u'raw': u'', 'raw': '',
} }
xml_response = '' xml_response = ''