diff options
| author | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
|---|---|---|
| committer | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
| commit | e84bf2140c33b45d1d9d8325eeaf62a97c46495e (patch) | |
| tree | d95d6755f787c8ab3d8c555315d514c067121bf9 /djangorestframework/tests/renderers.py | |
| parent | 0632e946f977609ca6d6f4272f02c72dee1f49be (diff) | |
| parent | 4f42303035c094a1d0c6128f0ccce1abfa6b72f4 (diff) | |
| download | django-rest-framework-e84bf2140c33b45d1d9d8325eeaf62a97c46495e.tar.bz2 | |
fix merge
Diffstat (limited to 'djangorestframework/tests/renderers.py')
| -rw-r--r-- | djangorestframework/tests/renderers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py index 5b2d3556..d6a49984 100644 --- a/djangorestframework/tests/renderers.py +++ b/djangorestframework/tests/renderers.py @@ -228,6 +228,7 @@ if YAMLRenderer: (data, files) = parser.parse(StringIO(content)) self.assertEquals(obj, data) + class XMLRendererTestCase(TestCase): """ @@ -288,4 +289,4 @@ class XMLRendererTestCase(TestCase): def assertXMLContains(self, xml, string): self.assertTrue(xml.startswith('<?xml version="1.0" encoding="utf-8"?>\n<root>')) self.assertTrue(xml.endswith('</root>')) - self.assertTrue(string in xml, '%r not in %r' % (string, xml))
\ No newline at end of file + self.assertTrue(string in xml, '%r not in %r' % (string, xml)) |