Moved sys.path-extending decorator to django.test.utils and used throughout test suite.

Thanks Aymeric for the suggestion.

1 files changed, 8 insertions, 15 deletions

diff --git a/tests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py
index 11acbd216d..ec9e4c5a78 100644
--- a/tests/proxy_model_inheritance/tests.py
+++ b/tests/proxy_model_inheritance/tests.py
@@ -1,11 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
-import sys
 
 from django.core.management import call_command
 from django.test import TestCase, TransactionTestCase
-from django.test.utils import override_system_checks
+from django.test.utils import override_system_checks, extend_sys_path
 from django.utils._os import upath
 
 from .models import (ConcreteModel, ConcreteModelSubclass,
@@ -20,23 +19,17 @@ class ProxyModelInheritanceTests(TransactionTestCase):
     """
     available_apps = []
 
-    def setUp(self):
-        self.old_sys_path = sys.path[:]
-        sys.path.append(os.path.dirname(os.path.abspath(upath(__file__))))
-
-    def tearDown(self):
-        sys.path = self.old_sys_path
-
     # `auth` app is imported, but not installed in this test, so we need to
     # exclude checks registered by this app.
     @override_system_checks([])
     def test_table_exists(self):
-        with self.modify_settings(INSTALLED_APPS={'append': ['app1', 'app2']}):
-            call_command('migrate', verbosity=0)
-            from app1.models import ProxyModel
-            from app2.models import NiceModel
-            self.assertEqual(NiceModel.objects.all().count(), 0)
-            self.assertEqual(ProxyModel.objects.all().count(), 0)
+        with extend_sys_path(os.path.dirname(os.path.abspath(upath(__file__)))):
+            with self.modify_settings(INSTALLED_APPS={'append': ['app1', 'app2']}):
+                call_command('migrate', verbosity=0)
+                from app1.models import ProxyModel
+                from app2.models import NiceModel
+                self.assertEqual(NiceModel.objects.all().count(), 0)
+                self.assertEqual(ProxyModel.objects.all().count(), 0)
 
 
 class MultiTableInheritanceProxyTest(TestCase):