From 6092ea8fa62191bf9ed8ebaae3125dcde9c4bbec Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Tue, 7 Mar 2017 21:00:43 +0000
Subject: Refs #27804 -- Used subTest() in several tests.

---
 tests/admin_views/test_multidb.py | 45 +++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'tests/admin_views/test_multidb.py')

diff --git a/tests/admin_views/test_multidb.py b/tests/admin_views/test_multidb.py
index 3687bec16f..9907e16d69 100644
--- a/tests/admin_views/test_multidb.py
+++ b/tests/admin_views/test_multidb.py
@@ -47,32 +47,35 @@ class MultiDatabaseTests(TestCase):
     @mock.patch('django.contrib.admin.options.transaction')
     def test_add_view(self, mock):
         for db in connections:
-            Router.target_db = db
-            self.client.force_login(self.superusers[db])
-            self.client.post(
-                reverse('test_adminsite:admin_views_book_add'),
-                {'name': 'Foobar: 5th edition'},
-            )
-            mock.atomic.assert_called_with(using=db)
+            with self.subTest(db=db):
+                Router.target_db = db
+                self.client.force_login(self.superusers[db])
+                self.client.post(
+                    reverse('test_adminsite:admin_views_book_add'),
+                    {'name': 'Foobar: 5th edition'},
+                )
+                mock.atomic.assert_called_with(using=db)
 
     @mock.patch('django.contrib.admin.options.transaction')
     def test_change_view(self, mock):
         for db in connections:
-            Router.target_db = db
-            self.client.force_login(self.superusers[db])
-            self.client.post(
-                reverse('test_adminsite:admin_views_book_change', args=[self.test_book_ids[db]]),
-                {'name': 'Test Book 2: Test more'},
-            )
-            mock.atomic.assert_called_with(using=db)
+            with self.subTest(db=db):
+                Router.target_db = db
+                self.client.force_login(self.superusers[db])
+                self.client.post(
+                    reverse('test_adminsite:admin_views_book_change', args=[self.test_book_ids[db]]),
+                    {'name': 'Test Book 2: Test more'},
+                )
+                mock.atomic.assert_called_with(using=db)
 
     @mock.patch('django.contrib.admin.options.transaction')
     def test_delete_view(self, mock):
         for db in connections:
-            Router.target_db = db
-            self.client.force_login(self.superusers[db])
-            self.client.post(
-                reverse('test_adminsite:admin_views_book_delete', args=[self.test_book_ids[db]]),
-                {'post': 'yes'},
-            )
-            mock.atomic.assert_called_with(using=db)
+            with self.subTest(db=db):
+                Router.target_db = db
+                self.client.force_login(self.superusers[db])
+                self.client.post(
+                    reverse('test_adminsite:admin_views_book_delete', args=[self.test_book_ids[db]]),
+                    {'post': 'yes'},
+                )
+                mock.atomic.assert_called_with(using=db)
-- 
cgit v1.3