summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugins
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 10:00:38 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 10:00:38 -0400
commitd59c274547b6aecb3bcbfb99d1b874d403c51bea (patch)
tree7d83406c21f1825a7ec24675f2b6f86123a62da0 /testsuite/Testlib/TestServer/TestPlugins
parent2c86f67fa234406ee0007a3f77cc1aa9f45ed746 (diff)
downloadbcfg2-d59c274547b6aecb3bcbfb99d1b874d403c51bea.tar.gz
bcfg2-d59c274547b6aecb3bcbfb99d1b874d403c51bea.tar.bz2
bcfg2-d59c274547b6aecb3bcbfb99d1b874d403c51bea.zip
fixed lxml.etree.tostring invocations
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugins')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
index 38161215d..1bee16d59 100644
--- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
+++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py
@@ -52,7 +52,8 @@ class TestProbeData(Bcfg2TestCase):
def test_xdata(self):
xdata = lxml.etree.Element("test")
lxml.etree.SubElement(xdata, "test2")
- data = ProbeData(lxml.etree.tostring(xdata, encoding='unicode'))
+ data = ProbeData(lxml.etree.tostring(xdata,
+ xml_declaration=False).decode('UTF-8'))
self.assertIsNotNone(data.xdata)
self.assertIsNotNone(data.xdata.find("test2"))
@@ -192,7 +193,8 @@ class TestProbes(TestProbing, TestConnector, TestDatabaseBacked):
rv = dict()
rv["foo.example.com"] = ClientProbeDataSet(timestamp=time.time())
rv["foo.example.com"]["xml"] = \
- ProbeData(lxml.etree.tostring(test_xdata, encoding='unicode'))
+ ProbeData(lxml.etree.tostring(test_xdata,
+ xml_declaration=False).decode('UTF-8'))
rv["foo.example.com"]["text"] = ProbeData("freeform text")
rv["foo.example.com"]["multiline"] = ProbeData("""multiple
lines