summaryrefslogtreecommitdiff
path: root/tests/regressiontests/app_loading
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-03-18 01:08:34 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-03-18 01:08:34 +0000
commit39c450cc6d71e2260994594d7ef42085e83f4fdd (patch)
treea8a2151e03db256f61b9e4a7378889902a3102ea /tests/regressiontests/app_loading
parent75b286798f07eea7f7edca6356e7fed1202f32c1 (diff)
Fixed #10526 -- More fixes when specifying installed apps using "foo.*".
This adds a case that was missed in r9925: underscore handling. Backport of r10078 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/app_loading')
-rw-r--r--tests/regressiontests/app_loading/parent/__init__.py1
-rw-r--r--tests/regressiontests/app_loading/parent/app/__init__.py1
-rw-r--r--tests/regressiontests/app_loading/parent/app1/__init__.py1
-rw-r--r--tests/regressiontests/app_loading/parent/app_2/__init__.py0
-rw-r--r--tests/regressiontests/app_loading/tests.py2
5 files changed, 1 insertions, 4 deletions
diff --git a/tests/regressiontests/app_loading/parent/__init__.py b/tests/regressiontests/app_loading/parent/__init__.py
index 51c842b5ba..e69de29bb2 100644
--- a/tests/regressiontests/app_loading/parent/__init__.py
+++ b/tests/regressiontests/app_loading/parent/__init__.py
@@ -1 +0,0 @@
-# not empty to make SVN happy
diff --git a/tests/regressiontests/app_loading/parent/app/__init__.py b/tests/regressiontests/app_loading/parent/app/__init__.py
index 51c842b5ba..e69de29bb2 100644
--- a/tests/regressiontests/app_loading/parent/app/__init__.py
+++ b/tests/regressiontests/app_loading/parent/app/__init__.py
@@ -1 +0,0 @@
-# not empty to make SVN happy
diff --git a/tests/regressiontests/app_loading/parent/app1/__init__.py b/tests/regressiontests/app_loading/parent/app1/__init__.py
index 51c842b5ba..e69de29bb2 100644
--- a/tests/regressiontests/app_loading/parent/app1/__init__.py
+++ b/tests/regressiontests/app_loading/parent/app1/__init__.py
@@ -1 +0,0 @@
-# not empty to make SVN happy
diff --git a/tests/regressiontests/app_loading/parent/app_2/__init__.py b/tests/regressiontests/app_loading/parent/app_2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/app_loading/parent/app_2/__init__.py
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py
index 444de10d79..bc958c0d88 100644
--- a/tests/regressiontests/app_loading/tests.py
+++ b/tests/regressiontests/app_loading/tests.py
@@ -14,7 +14,7 @@ Test the globbing of INSTALLED_APPS.
>>> settings = Settings('test_settings')
>>> settings.INSTALLED_APPS
-['parent.app', 'parent.app1']
+['parent.app', 'parent.app1', 'parent.app_2']
>>> sys.path = old_sys_path