summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDiego GuimarĂ£es <diegobr.sistemas@gmail.com>2014-12-05 12:25:10 -0200
committerTim Graham <timograham@gmail.com>2014-12-05 16:19:59 -0500
commitd05709821cf6ff77e00871d6fac3eb43356d44d1 (patch)
tree454a450ece36e66b5f2db098cb0558145ed7c8c4 /tests
parentebfadb808043c689b19cfee818c10f63866ee8fc (diff)
Refs #23947 -- Made a modeladmin test cleanup after itself.
Diffstat (limited to 'tests')
-rw-r--r--tests/modeladmin/tests.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py
index 93cb58a42c..a0dfb2a72d 100644
--- a/tests/modeladmin/tests.py
+++ b/tests/modeladmin/tests.py
@@ -1625,10 +1625,15 @@ class ModelAdminPermissionTests(TestCase):
self.assertTrue(ma.has_module_permission(request))
request.user = self.MockDeleteUser()
self.assertTrue(ma.has_module_permission(request))
- ma.opts.app_label = "anotherapp"
- request.user = self.MockAddUser()
- self.assertFalse(ma.has_module_permission(request))
- request.user = self.MockChangeUser()
- self.assertFalse(ma.has_module_permission(request))
- request.user = self.MockDeleteUser()
- self.assertFalse(ma.has_module_permission(request))
+
+ original_app_label = ma.opts.app_label
+ ma.opts.app_label = 'anotherapp'
+ try:
+ request.user = self.MockAddUser()
+ self.assertFalse(ma.has_module_permission(request))
+ request.user = self.MockChangeUser()
+ self.assertFalse(ma.has_module_permission(request))
+ request.user = self.MockDeleteUser()
+ self.assertFalse(ma.has_module_permission(request))
+ finally:
+ ma.opts.app_label = original_app_label