Changeset 3660

Timestamp:

08/27/06 07:46:39 (2 years ago)

Author:

russellm

Message:

Refs #2333 - Added 'test' target to django-admin script. Includes addition of --verbosity and --noinput options to django-admin, and a new TEST_RUNNER setting to control the tool used to execute tests.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/contrib/auth/management.py (modified) (2 diffs)
• django/trunk/django/contrib/contenttypes/management.py (modified) (2 diffs)
• django/trunk/django/contrib/sites/management.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (9 diffs)

django/trunk/django/conf/global_settings.py

@@ -297 +297 @@
-
-AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+
+###########
+# TESTING #
+###########
+
+TEST_RUNNER='django.test.simple.run_tests'

django/trunk/django/contrib/auth/management.py

@@ -17 +17 @@
-    return perms + list(opts.permissions)
-
-
+, verbosity
-    from django.contrib.contenttypes.models import ContentType
-    from django.contrib.auth.models import Permission
@@ -28 +28 @@
-            p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id,
-                defaults={'name': name, 'content_type': ctype})
-
+ and verbosity >= 2
-                print "Adding permission '%s'" % p
-
-
+, verbosity, **kwargs
-    from django.contrib.auth.models import User
-    from django.contrib.auth.create_superuser import createsuperuser as do_create
-
+ and kwargs.get('interactive', True)
-        msg = "\nYou just installed Django's auth system, which means you don't have " \
-                "any superusers defined.\nWould you like to create one now? (yes/no): "

django/trunk/django/contrib/contenttypes/management.py

@@ -6 +6 @@
-from django.db.models import get_models, signals
-
-
+, verbosity
-    from django.contrib.contenttypes.models import ContentType
-    app_models = get_models(app)
@@ -20 +20 @@
-                app_label=opts.app_label, model=opts.object_name.lower())
-            ct.save()
-
+
+
-
-dispatcher.connect(create_contenttypes, signal=signals.post_syncdb)

django/trunk/django/contrib/sites/management.py

@@ -8 +8 @@
-from django.contrib.sites import models as site_app
-
-
+, verbosity
-    if Site in created_models:
-
+
+
-        s = Site(domain="example.com", name="example.com")
-        s.save()

django/trunk/django/core/management.py

@@ -424 +424 @@
-get_sql_all.args = APP_ARGS
-
-
+verbosity=2, interactive=True
-    "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-    from django.db import connection, transaction, models, get_creation_module
@@ -472 +472 @@
-                    pending_references[refto] = refs
-            sql.extend(_get_sql_for_pending_references(model, pending_references))
-
+
+
-            for statement in sql:
-                cursor.execute(statement)
@@ -481 +482 @@
-                sql = _get_many_to_many_sql_for_model(model)
-                if sql:
-
+
+
-                    for statement in sql:
-                        cursor.execute(statement)
@@ -491 +493 @@
-    for app in models.get_apps():
-        dispatcher.send(signal=signals.post_syncdb, sender=app,
-
+
+
-
-        # Install initial data for the app (but only if this is a model we've
@@ -1155 +1158 @@
-runfcgi.args = '[various KEY=val options, use `runfcgi help` for help]'
-
+def test(verbosity, app_labels):
+    "Runs the test suite for the specified applications"
+    from django.conf import settings
+    from django.db.models import get_app, get_apps
+
+    if len(app_labels) == 0:
+        app_list = get_apps()
+    else:
+        app_list = [get_app(app_label) for app_label in app_labels]
+    
+    test_path = settings.TEST_RUNNER.split('.')
+    # Allow for Python 2.5 relative paths
+    if len(test_path) > 1:
+        test_module_name = '.'.join(test_path[:-1])
+    else:
+        test_module_name = '.'
+    test_module = __import__(test_module_name, [],[],test_path[-1])
+    test_runner = getattr(test_module, test_path[-1])
+    
+    test_runner(app_list, verbosity)
+test.help_doc = 'Runs the test suite for the specified applications, or the entire site if no apps are specified'
+test.args = '[--verbosity] ' + APP_ARGS
+
-# Utilities for command-line script
-
@@ -1179 +1205 @@
-    'syncdb': syncdb,
-    'validate': validate,
+    'test':test,
-}
-
@@ -1229 +1256 @@
-    parser.add_option('--plain', action='store_true', dest='plain',
-        help='Tells Django to use plain Python, not IPython, for "shell" command.')
+    parser.add_option('--noinput', action='store_false', dest='interactive', default=True,
+        help='Tells Django to NOT prompt the user for input of any kind.')
-    parser.add_option('--noreload', action='store_false', dest='use_reloader', default=True,
-        help='Tells Django to NOT use the auto-reloader when running the development server.')
+    parser.add_option('--verbosity', action='store', dest='verbosity', default='2',
+        type='choice', choices=['0', '1', '2'],
+        help='Verbosity level; 0=minimal output, 1=normal output, 2=all output')
+
-    options, args = parser.parse_args(argv[1:])
-
@@ -1257 +1290 @@
-    if action == 'shell':
-        action_mapping[action](options.plain is True)
-syncdb', '
+
-        action_mapping[action]()
+    elif action == 'syncdb':
+        action_mapping[action](int(options.verbosity), options.interactive)
-    elif action == 'inspectdb':
-        try:
@@ -1269 +1304 @@
-        try:
-            action_mapping[action](args[1])
+        except IndexError:
+            parser.print_usage_and_exit()
+    elif action == 'test':
+        try:
+            action_mapping[action](int(options.verbosity), args[1:])
-        except IndexError:
-            parser.print_usage_and_exit()