diff options
| author | Markus Holtermann <info@markusholtermann.eu> | 2015-04-13 17:23:20 +0200 |
|---|---|---|
| committer | Markus Holtermann <info@markusholtermann.eu> | 2015-04-14 11:27:57 +0200 |
| commit | 584c6591a3c29c94026e3bebc3e5302a3d7530e3 (patch) | |
| tree | f22f292c912ad64f8cb57cead65b034674ca4cbd /tests/admin_docs | |
| parent | 496800b3bf4460e697dee942696eaee5c56f87a0 (diff) | |
[1.8.x] Refs #24625 -- Filtered docutils warnings output in tests
Instead of setting ``warning_stream`` in the docutils config overrides
to ``False`` I opted for filtering the stderr in the tests to keep the
error output showing up in server logs.
Thanks Tim Graham for the report and review
Backport of 3caf7efb44712f89d6552076c240a3c898673a2c from master
Diffstat (limited to 'tests/admin_docs')
| -rw-r--r-- | tests/admin_docs/tests.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py index 94054f9437..4478f5bee5 100644 --- a/tests/admin_docs/tests.py +++ b/tests/admin_docs/tests.py @@ -8,6 +8,7 @@ from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django.test import TestCase, modify_settings, override_settings +from django.test.utils import captured_stderr from .models import Company, Person @@ -210,9 +211,8 @@ class TestModelDetailView(AdminDocsTestCase): def setUp(self): self.client.login(username='super', password='secret') - self.response = self.client.get( - reverse('django-admindocs-models-detail', - args=['admin_docs', 'person'])) + with captured_stderr() as self.docutils_stderr: + self.response = self.client.get(reverse('django-admindocs-models-detail', args=['admin_docs', 'person'])) def test_method_excludes(self): """ @@ -285,6 +285,9 @@ class TestModelDetailView(AdminDocsTestCase): self.assertContains(self.response, '.. raw:: html\n :file: admin_docs/evilfile.txt') self.assertContains(self.response, '<p>"include" directive disabled.</p>',) self.assertContains(self.response, '.. include:: admin_docs/evilfile.txt') + out = self.docutils_stderr.getvalue() + self.assertIn('"raw" directive disabled', out) + self.assertIn('"include" directive disabled', out) def test_model_with_many_to_one(self): link = '<a class="reference external" href="/admindocs/models/%s/">%s</a>' |
