Merge branch 'master' into andrepl-master

Conflicts:
	debug_toolbar/middleware.py

1 files changed, 47 insertions, 0 deletions

diff --git a/debug_toolbar/runtests.py b/debug_toolbar/runtests.py
new file mode 100644
index 0000000..f16882a
--- /dev/null
+++ b/debug_toolbar/runtests.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+import sys
+from os.path import dirname, abspath
+
+from django.conf import settings
+
+if not settings.configured:
+    settings.configure(
+        DATABASE_ENGINE='sqlite3',
+        # HACK: this fixes our threaded runserver remote tests
+        # DATABASE_NAME='test_sentry',
+        # TEST_DATABASE_NAME='test_sentry',
+        INSTALLED_APPS=[
+            'django.contrib.auth',
+            'django.contrib.admin',
+            'django.contrib.contenttypes',
+            'django.contrib.sessions',
+            'django.contrib.sites',
+
+            'debug_toolbar',
+            
+            'debug_toolbar.tests',
+        ],
+        ROOT_URLCONF='',
+        DEBUG=False,
+        SITE_ID=1,
+    )
+    import djcelery
+    djcelery.setup_loader()
+
+from django.test.simple import run_tests
+
+def runtests(*test_args):
+    if 'south' in settings.INSTALLED_APPS:
+        from south.management.commands import patch_for_test_db_setup
+        patch_for_test_db_setup()
+
+    if not test_args:
+        test_args = ['debug_toolbar']
+    parent = dirname(abspath(__file__))
+    sys.path.insert(0, parent)
+    failures = run_tests(test_args, verbosity=1, interactive=True)
+    sys.exit(failures)
+
+
+if __name__ == '__main__':
+    runtests(*sys.argv[1:])
\ No newline at end of file