summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2011-11-27 21:17:33 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2011-11-27 21:17:33 +0000
commit9d6321c9216db6f34cd0fe6cd6467f8b80029436 (patch)
treefafbce66f7fd47202d5c85049cd2d871620d2513
parent7872fc0dab2ad9971fb044b73ff33980aa4e7381 (diff)
Removed tests of the globbing feature that was removed at r17158. Refs #16247.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--tests/regressiontests/app_loading/parent/__init__.py0
-rw-r--r--tests/regressiontests/app_loading/parent/app/__init__.py0
-rw-r--r--tests/regressiontests/app_loading/parent/app1/__init__.py0
-rw-r--r--tests/regressiontests/app_loading/parent/app_2/__init__.py0
-rw-r--r--tests/regressiontests/app_loading/test_settings.py3
-rw-r--r--tests/regressiontests/app_loading/tests.py18
6 files changed, 0 insertions, 21 deletions
diff --git a/tests/regressiontests/app_loading/parent/__init__.py b/tests/regressiontests/app_loading/parent/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/regressiontests/app_loading/parent/__init__.py
+++ /dev/null
diff --git a/tests/regressiontests/app_loading/parent/app/__init__.py b/tests/regressiontests/app_loading/parent/app/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/regressiontests/app_loading/parent/app/__init__.py
+++ /dev/null
diff --git a/tests/regressiontests/app_loading/parent/app1/__init__.py b/tests/regressiontests/app_loading/parent/app1/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/regressiontests/app_loading/parent/app1/__init__.py
+++ /dev/null
diff --git a/tests/regressiontests/app_loading/parent/app_2/__init__.py b/tests/regressiontests/app_loading/parent/app_2/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/regressiontests/app_loading/parent/app_2/__init__.py
+++ /dev/null
diff --git a/tests/regressiontests/app_loading/test_settings.py b/tests/regressiontests/app_loading/test_settings.py
deleted file mode 100644
index e956311b0a..0000000000
--- a/tests/regressiontests/app_loading/test_settings.py
+++ /dev/null
@@ -1,3 +0,0 @@
-INSTALLED_APPS = (
- 'parent.*',
-)
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py
index cec565ab08..5173338399 100644
--- a/tests/regressiontests/app_loading/tests.py
+++ b/tests/regressiontests/app_loading/tests.py
@@ -9,24 +9,6 @@ from django.conf import Settings
from django.db.models.loading import cache, load_app, get_model, get_models
from django.utils.unittest import TestCase
-
-class InstalledAppsGlobbingTest(TestCase):
- def setUp(self):
- self.OLD_SYS_PATH = sys.path[:]
- sys.path.append(os.path.dirname(os.path.abspath(__file__)))
- self.OLD_TZ = os.environ.get("TZ")
-
- def test_globbing(self):
- settings = Settings('test_settings')
- self.assertEqual(settings.INSTALLED_APPS, ['parent.app', 'parent.app1', 'parent.app_2'])
-
- def tearDown(self):
- sys.path = self.OLD_SYS_PATH
- if hasattr(time, "tzset") and self.OLD_TZ:
- os.environ["TZ"] = self.OLD_TZ
- time.tzset()
-
-
class EggLoadingTest(TestCase):
def setUp(self):