Changeset 5296

Timestamp:

05/19/07 22:51:21 (1 year ago)

Author:

russellm

Message:

Modified the django system test script to search for tests in the contrib apps.

Files:

• django/trunk/django/contrib/webdesign/models.py (added)
• django/trunk/django/contrib/webdesign/tests.py (added)
• django/trunk/tests/runtests.py (modified) (4 diffs)

django/trunk/tests/runtests.py

@@ -4 +4 @@
-import unittest
-
+import django.contrib as contrib
+CONTRIB_DIR_NAME = 'django.contrib'
-MODEL_TESTS_DIR_NAME = 'modeltests'
-REGRESSION_TESTS_DIR_NAME = 'regressiontests'
+
-TEST_DATABASE_NAME = 'django_test_db'
-TEST_TEMPLATE_DIR = 'templates'
-
+CONTRIB_DIR = os.path.dirname(contrib.__file__)
-MODEL_TEST_DIR = os.path.join(os.path.dirname(__file__), MODEL_TESTS_DIR_NAME)
-REGRESSION_TEST_DIR = os.path.join(os.path.dirname(__file__), REGRESSION_TESTS_DIR_NAME)
@@ -25 +29 @@
-def get_test_models():
-    models = []
-
+, (CONTRIB_DIR_NAME, CONTRIB_DIR)
-        for f in os.listdir(dirpath):
-            if f.startswith('__init__') or f.startswith('.') or f.startswith('sql') or f.startswith('invalid'):
@@ -34 +38 @@
-def get_invalid_models():
-    models = []
-
+, (CONTRIB_DIR_NAME, CONTRIB_DIR)
-        for f in os.listdir(dirpath):
-            if f.startswith('__init__') or f.startswith('.') or f.startswith('sql'):
@@ -110 +114 @@
-                    print "Importing model %s" % model_name
-                mod = load_app(model_label)
-
-
+
+
+
+
-        except Exception, e:
-            sys.stderr.write("Error while importing %s:" % model_name + ''.join(traceback.format_exception(*sys.exc_info())[1:]))