summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-20 01:41:43 +0000
committerGerrit Code Review <review@openstack.org>2013-02-20 01:41:43 +0000
commit4bc4b25c8d155855b16b42a7f87eb2e1f1bd061b (patch)
treeca01bae7ebd227b290daf4b510b2f2de44d13e21 /nova
parent9683845d38df3d0a85a54314f5c0e2cb4b3b5fca (diff)
parenta7f72a59ba3214f19c7bd66a7ef465ecc22794dd (diff)
downloadnova-4bc4b25c8d155855b16b42a7f87eb2e1f1bd061b.tar.gz
nova-4bc4b25c8d155855b16b42a7f87eb2e1f1bd061b.tar.xz
nova-4bc4b25c8d155855b16b42a7f87eb2e1f1bd061b.zip
Merge "Fix XMLMatcher error reporting"
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/matchers.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/matchers.py b/nova/tests/matchers.py
index be65da823..280b2842c 100644
--- a/nova/tests/matchers.py
+++ b/nova/tests/matchers.py
@@ -20,6 +20,8 @@
import pprint
+from testtools import content
+
from lxml import etree
@@ -226,8 +228,8 @@ class XMLMismatch(object):
def get_details(self):
return {
- 'expected': self.expected,
- 'actual': self.actual,
+ 'expected': content.text_content(self.expected),
+ 'actual': content.text_content(self.actual),
}