From 2a7c8d5aad2ab6c5d596ae0ca4d117e763de3f58 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Tue, 5 Apr 2011 10:10:17 -0700 Subject: [PATCH] Adjust django driver script to test the whole package. I moved settings & manage up a bit in the tree, and added a dependency on python-django-nose which uses nose for the django test runner. This version is using the class based runner, which appears to require django 1.2. I'm not sure what's on the cluster machines right now. --- htsworkflow/{frontend => }/settings.py | 8 ++++++-- htsworkflow/frontend/manage.py => manage.py | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename htsworkflow/{frontend => }/settings.py (96%) rename htsworkflow/frontend/manage.py => manage.py (100%) diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/settings.py similarity index 96% rename from htsworkflow/frontend/settings.py rename to htsworkflow/settings.py index ff88816..9569d3e 100644 --- a/htsworkflow/frontend/settings.py +++ b/htsworkflow/settings.py @@ -86,7 +86,8 @@ options_to_list(options, ADMINS, 'frontend', 'admins') MANAGERS = [] options_to_list(options, MANAGERS, 'frontend', 'managers') -AUTHENTICATION_BACKENDS = ( 'samples.auth_backend.HTSUserModelBackend', ) +AUTHENTICATION_BACKENDS = ( + 'htsworkflow.frontend.samples.auth_backend.HTSUserModelBackend', ) CUSTOM_USER_MODEL = 'samples.HTSUser' EMAIL_HOST = options.get('frontend', 'email_host') @@ -168,7 +169,7 @@ TEMPLATE_DIRS = ( # Don't forget to use absolute paths, not relative paths. '/usr/share/python-support/python-django/django/contrib/admin/templates', #'/usr/lib/pymodules/python2.6/django/contrib/admin/templates/', - os.path.join(os.path.split(__file__)[0], 'templates'), + os.path.join(os.path.split(__file__)[0], 'frontend','templates'), ) INSTALLED_APPS = ( @@ -178,6 +179,7 @@ INSTALLED_APPS = ( 'django.contrib.humanize', 'django.contrib.sessions', 'django.contrib.sites', + 'django_nose', 'htsworkflow.frontend.eland_config', 'htsworkflow.frontend.samples', # modules from htsworkflow branch @@ -213,3 +215,5 @@ BCPRINTER_PRINTER1_HOST = options.get('bcprinter', 'printer1_host') BCPRINTER_PRINTER1_PORT = int(options.get('bcprinter', 'printer1_port')) BCPRINTER_PRINTER2_HOST = options.get('bcprinter', 'printer2_host') BCPRINTER_PRINTER2_PORT = int(options.get('bcprinter', 'printer2_port')) + +TEST_RUNNER='django_nose.NoseTestSuiteRunner' diff --git a/htsworkflow/frontend/manage.py b/manage.py similarity index 100% rename from htsworkflow/frontend/manage.py rename to manage.py -- 2.30.2