Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test case cleanup #106

Closed
wants to merge 2 commits into from
Closed

Test case cleanup #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f907a
encoding data otherwise getting exception ValueError: Unicode strings…
vnitinv Feb 3, 2016
ef06a22
passing raw data to function
vnitinv Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ncclient/xml_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def validated_element(x, tags=None, attrs=None):

Raises :exc:`XMLError` if the requirements are not met.
"""
ele = to_ele(x)
ele = to_ele(x) if sys.version < '3' else to_ele(x.encode('UTF-8'))
if tags:
if isinstance(tags, (str, bytes)):
tags = [tags]
Expand Down
20 changes: 4 additions & 16 deletions test/unit/test_xml_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,7 @@ def test_validated_element_pass(self):
device_handler = manager.make_device_handler(device_params)
transform_reply = device_handler.transform_reply()
result = NCElement(self.reply, transform_reply)
if sys.version >= '3':
result_xml = bytes(result.data_xml, "utf-8")
else:
result_xml = result.data_xml
result_xml = result.data_xml
ele = validated_element(
result_xml, tags=["rpc-reply", "rpc"], attrs=[["attrib1", "attrib2"]])
self.assertEqual(ele.tag, "rpc-reply")
Expand All @@ -148,10 +145,7 @@ def test_validated_element_fail(self):
transform_reply = device_handler.transform_reply()
result = NCElement(self.reply, transform_reply)
XMLError.message = "Element does not meet requirement"
if sys.version >= '3':
result_xml = bytes(result.data_xml, "utf-8")
else:
result_xml = result.data_xml
result_xml = result.data_xml
with self.assertRaises(XMLError):
validated_element(
result_xml, tags=["rpc"], attrs=[["attrib1", "attrib2"]])
Expand All @@ -162,10 +156,7 @@ def test_validated_element_fail_2(self):
transform_reply = device_handler.transform_reply()
result = NCElement(self.reply, transform_reply)
XMLError.message = "Element does not meet requirement"
if sys.version >= '3':
result_xml = bytes(result.data_xml, "utf-8")
else:
result_xml = result.data_xml
result_xml = result.data_xml
with self.assertRaises(XMLError):
validated_element(
result_xml,
Expand All @@ -182,9 +173,6 @@ def test_validated_element_fail_3(self):
transform_reply = device_handler.transform_reply()
result = NCElement(self.reply, transform_reply)
XMLError.message = "Element does not meet requirement"
if sys.version >= '3':
result_xml = bytes(result.data_xml, "utf-8")
else:
result_xml = result.data_xml
result_xml = result.data_xml
with self.assertRaises(XMLError):
validated_element(result_xml, tags=["rpc"])