innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Improved patching of sys.stdout in refs #23078.

This commit is contained in:
Tim Graham 2014-07-24 08:46:29 -04:00
parent 9b1515906e
commit 936fba5878
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/contenttypes_tests/tests.py
View File

@ -367,19 +367,20 @@ class UpdateContentTypesTests(TestCase):
self.before_count = ContentType.objects.count() self.before_count = ContentType.objects.count()
ContentType.objects.create(name='fake', app_label='contenttypes_tests', model='Fake') ContentType.objects.create(name='fake', app_label='contenttypes_tests', model='Fake')
self.app_config = apps.get_app_config('contenttypes_tests') self.app_config = apps.get_app_config('contenttypes_tests')
self.old_stdout = sys.stdout
sys.stdout = StringIO()
def tearDown(self):
sys.stdout = self.old_stdout
def test_interactive_true(self): def test_interactive_true(self):
""" """
interactive mode of update_contenttypes() (the default) should delete interactive mode of update_contenttypes() (the default) should delete
stale contenttypes. stale contenttypes.
""" """
self.old_stdout = sys.stdout
sys.stdout = StringIO()
management.input = lambda x: force_str("yes") management.input = lambda x: force_str("yes")
management.update_contenttypes(self.app_config) management.update_contenttypes(self.app_config)
output = sys.stdout.getvalue() self.assertIn("Deleting stale content type", sys.stdout.getvalue())
sys.stdout = self.old_stdout
self.assertIn("Deleting stale content type", output)
self.assertEqual(ContentType.objects.count(), self.before_count) self.assertEqual(ContentType.objects.count(), self.before_count)
def test_interactive_false(self): def test_interactive_false(self):
@ -387,12 +388,8 @@ class UpdateContentTypesTests(TestCase):
non-interactive mode of update_contenttypes() shouldn't delete stale non-interactive mode of update_contenttypes() shouldn't delete stale
content types. content types.
""" """
self.old_stdout = sys.stdout
sys.stdout = StringIO()
management.update_contenttypes(self.app_config, interactive=False) management.update_contenttypes(self.app_config, interactive=False)
output = sys.stdout.getvalue() self.assertIn("Stale content types remain.", sys.stdout.getvalue())
sys.stdout = self.old_stdout
self.assertIn("Stale content types remain.", output)
self.assertEqual(ContentType.objects.count(), self.before_count + 1) self.assertEqual(ContentType.objects.count(), self.before_count + 1)