From 494ba051bb0d3ebbdbea7598251b1ee6fe9b69b4 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Wed, 22 Oct 2014 00:15:10 +0700 Subject: Made testing of stdout and stderr more consistent. Refs #23663. --- tests/cache/tests.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/cache') diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 6410e0b0be..ee003e9cac 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -912,12 +912,9 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase): self._perform_cull_test(caches['zero_cull'], 50, 18) def test_second_call_doesnt_crash(self): - stdout = six.StringIO() - management.call_command( - 'createcachetable', - stdout=stdout - ) - self.assertEqual(stdout.getvalue(), + out = six.StringIO() + management.call_command('createcachetable', stdout=out) + self.assertEqual(out.getvalue(), "Cache table 'test cache table' already exists.\n" * len(settings.CACHES)) def test_createcachetable_with_table_argument(self): @@ -926,14 +923,14 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase): specifying the table name). """ self.drop_table() - stdout = six.StringIO() + out = six.StringIO() management.call_command( 'createcachetable', 'test cache table', verbosity=2, - stdout=stdout + stdout=out, ) - self.assertEqual(stdout.getvalue(), + self.assertEqual(out.getvalue(), "Cache table 'test cache table' created.\n") def test_clear_commits_transaction(self): -- cgit v1.3