Permalink
Browse files

Shuffling the tests around to make for easier testing, and adding test

runner to setup.py
  • Loading branch information...
1 parent d5edb8b commit 6bbfc4199d70268b6c653adc2ca5307cd1aaf092 @coleifer committed Feb 23, 2011
@@ -1,26 +0,0 @@
-DATABASE_ENGINE = 'sqlite3'
-
-SITE_ID = 1
-
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'relationships.tests.urls'
-
-INSTALLED_APPS = (
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'relationships',
- 'relationships.tests',
-)
View
@@ -0,0 +1,45 @@
+#!/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',
+ SITE_ID = 1,
+ TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
+ ),
+ MIDDLEWARE_CLASSES = (
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ ),
+ ROOT_URLCONF = 'relationships.relationships_tests.urls',
+ INSTALLED_APPS = [
+ 'django.contrib.admin',
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'relationships',
+ 'relationships.relationships_tests',
+ ],
+ )
+
+from django.test.simple import run_tests
+
+
+def runtests(*test_args):
+ if not test_args:
+ test_args = ['relationships_tests']
+ 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:])
View
@@ -34,4 +34,5 @@
'Programming Language :: Python',
'Framework :: Django',
],
+ test_suite='runtests.runtests',
)

0 comments on commit 6bbfc41

Please sign in to comment.