diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2007-07-23 12:14:32 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2007-07-23 12:14:32 +0000 |
| commit | 1b7fe09660e640bd3cdbf55d340b702d951dd22e (patch) | |
| tree | 61fb2561c28724599366947f52ae47d758b71f85 /django | |
| parent | 304381616f89745c2b52ba793e5b23184c4788bb (diff) | |
Fixed #3771 -- Modified the test runner to observe the --noinput argument controlling script interactivity. This means that test scripts can now be put in a buildbot environment. This is a backwards incompatible change for anyone that has written a custom test runner. Thanks for the suggestion, moof@metamoof.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/core/management.py | 13 | ||||
| -rw-r--r-- | django/test/simple.py | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/django/core/management.py b/django/core/management.py index 4c68417517..4862a7833f 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -1331,7 +1331,7 @@ def runfcgi(args): runfastcgi(args) runfcgi.args = '[various KEY=val options, use `runfcgi help` for help]' -def test(app_labels, verbosity=1): +def test(app_labels, verbosity=1, interactive=True): "Runs the test suite for the specified applications" from django.conf import settings from django.db.models import get_app, get_apps @@ -1350,12 +1350,12 @@ def test(app_labels, verbosity=1): test_module = __import__(test_module_name, {}, {}, test_path[-1]) test_runner = getattr(test_module, test_path[-1]) - failures = test_runner(app_list, verbosity) + failures = test_runner(app_list, verbosity=verbosity, interactive=interactive) if failures: sys.exit(failures) 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 +test.args = '[--verbosity] [--noinput]' + APP_ARGS def load_data(fixture_labels, verbosity=1): "Installs the provided fixture file(s) as data in the database." @@ -1631,7 +1631,12 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None): action_mapping[action](args[1]) except IndexError: parser.print_usage_and_exit() - elif action in ('test', 'loaddata'): + elif action == 'test': + try: + action_mapping[action](args[1:], int(options.verbosity), options.interactive) + except IndexError: + parser.print_usage_and_exit() + elif action == 'loaddata': try: action_mapping[action](args[1:], int(options.verbosity)) except IndexError: diff --git a/django/test/simple.py b/django/test/simple.py index 9730a0df1d..08e27429e4 100644 --- a/django/test/simple.py +++ b/django/test/simple.py @@ -69,7 +69,7 @@ def build_suite(app_module): return suite -def run_tests(module_list, verbosity=1, extra_tests=[]): +def run_tests(module_list, verbosity=1, interactive=True, extra_tests=[]): """ Run the unit tests for all the modules in the provided list. This testrunner will search each of the modules in the provided list, @@ -91,7 +91,7 @@ def run_tests(module_list, verbosity=1, extra_tests=[]): suite.addTest(test) old_name = settings.DATABASE_NAME - create_test_db(verbosity) + create_test_db(verbosity, autoclobber=not interactive) result = unittest.TextTestRunner(verbosity=verbosity).run(suite) destroy_test_db(old_name, verbosity) |