From 9d6321c9216db6f34cd0fe6cd6467f8b80029436 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 27 Nov 2011 21:17:33 +0000 Subject: [PATCH] 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 --- .../app_loading/parent/__init__.py | 0 .../app_loading/parent/app/__init__.py | 0 .../app_loading/parent/app1/__init__.py | 0 .../app_loading/parent/app_2/__init__.py | 0 .../app_loading/test_settings.py | 3 --- tests/regressiontests/app_loading/tests.py | 18 ------------------ 6 files changed, 21 deletions(-) delete mode 100644 tests/regressiontests/app_loading/parent/__init__.py delete mode 100644 tests/regressiontests/app_loading/parent/app/__init__.py delete mode 100644 tests/regressiontests/app_loading/parent/app1/__init__.py delete mode 100644 tests/regressiontests/app_loading/parent/app_2/__init__.py delete mode 100644 tests/regressiontests/app_loading/test_settings.py diff --git a/tests/regressiontests/app_loading/parent/__init__.py b/tests/regressiontests/app_loading/parent/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 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 e69de29bb2d1d..0000000000000 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 e69de29bb2d1d..0000000000000 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 e69de29bb2d1d..0000000000000 diff --git a/tests/regressiontests/app_loading/test_settings.py b/tests/regressiontests/app_loading/test_settings.py deleted file mode 100644 index e956311b0a749..0000000000000 --- 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 cec565ab08a52..517333839908a 100644 --- a/tests/regressiontests/app_loading/tests.py +++ b/tests/regressiontests/app_loading/tests.py @@ -9,24 +9,6 @@ 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):