diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | testproject/manage.py | 14 | ||||
| -rw-r--r-- | testproject/requirements.txt | 1 | ||||
| -rw-r--r-- | testproject/settings.py | 153 | ||||
| -rw-r--r-- | testproject/urls.py | 17 | ||||
| -rw-r--r-- | wkhtmltopdf/test_settings.py | 16 | ||||
| -rw-r--r-- | wkhtmltopdf/tests/__init__.py (renamed from testproject/__init__.py) | 0 | ||||
| -rw-r--r-- | wkhtmltopdf/tests/models.py | 0 | ||||
| -rw-r--r-- | wkhtmltopdf/tests/templates/footer.html (renamed from testproject/templates/footer.html) | 0 | ||||
| -rw-r--r-- | wkhtmltopdf/tests/templates/sample.html (renamed from testproject/templates/sample.html) | 0 | ||||
| -rw-r--r-- | wkhtmltopdf/tests/tests.py (renamed from wkhtmltopdf/tests.py) | 6 |
11 files changed, 20 insertions, 189 deletions
@@ -4,4 +4,4 @@ release: python setup.py register sdist upload test: - python testproject/manage.py test wkhtmltopdf + django-admin.py test tests --settings=wkhtmltopdf.test_settings diff --git a/testproject/manage.py b/testproject/manage.py deleted file mode 100644 index 3e4eedc..0000000 --- a/testproject/manage.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python -from django.core.management import execute_manager -import imp -try: - imp.find_module('settings') # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__) - sys.exit(1) - -import settings - -if __name__ == "__main__": - execute_manager(settings) diff --git a/testproject/requirements.txt b/testproject/requirements.txt deleted file mode 100644 index 74c18fb..0000000 --- a/testproject/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -Django==1.3.1 diff --git a/testproject/settings.py b/testproject/settings.py deleted file mode 100644 index 33674d4..0000000 --- a/testproject/settings.py +++ /dev/null @@ -1,153 +0,0 @@ -import os - -PROJECT_PATH = os.path.abspath(os.path.dirname(__file__)) - -# Django settings for testproject project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@example.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'test.db', # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'America/Chicago' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -USE_L10N = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash. -# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" -MEDIA_URL = '' - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = '' - -# URL prefix for static files. -# Example: "http://media.lawrence.com/static/" -STATIC_URL = '/static/' - -# URL prefix for admin static files -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' - -# Additional locations of static files -STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -# List of finder classes that know how to find static files in -# various locations. -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -) - -# Make this unique, and don't share it with anybody. -SECRET_KEY = '$)v)0$h)^c5!h2wms8*wn1c!7)7dp@qb87h7q)zecp2@$pnv=g' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'testproject.urls' - -TEMPLATE_DIRS = ( - os.path.join(PROJECT_PATH, 'templates') - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', - - 'testproject', - 'wkhtmltopdf', -) - -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'class': 'django.utils.log.AdminEmailHandler' - } - }, - 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, - } -} diff --git a/testproject/urls.py b/testproject/urls.py deleted file mode 100644 index 039e61a..0000000 --- a/testproject/urls.py +++ /dev/null @@ -1,17 +0,0 @@ -from django.conf.urls.defaults import patterns, include, url - -# Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() - -urlpatterns = patterns('', - # Examples: - # url(r'^$', 'testproject.views.home', name='home'), - # url(r'^testproject/', include('testproject.foo.urls')), - - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - # url(r'^admin/', include(admin.site.urls)), -) diff --git a/wkhtmltopdf/test_settings.py b/wkhtmltopdf/test_settings.py new file mode 100644 index 0000000..37d086f --- /dev/null +++ b/wkhtmltopdf/test_settings.py @@ -0,0 +1,16 @@ +DEBUG = True + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', + } +} + +MEDIA_URL = '' +STATIC_URL = '' + +INSTALLED_APPS = ( + 'wkhtmltopdf.tests', + 'wkhtmltopdf', +) diff --git a/testproject/__init__.py b/wkhtmltopdf/tests/__init__.py index e69de29..e69de29 100644 --- a/testproject/__init__.py +++ b/wkhtmltopdf/tests/__init__.py diff --git a/wkhtmltopdf/tests/models.py b/wkhtmltopdf/tests/models.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/wkhtmltopdf/tests/models.py diff --git a/testproject/templates/footer.html b/wkhtmltopdf/tests/templates/footer.html index 3ae09cb..3ae09cb 100644 --- a/testproject/templates/footer.html +++ b/wkhtmltopdf/tests/templates/footer.html diff --git a/testproject/templates/sample.html b/wkhtmltopdf/tests/templates/sample.html index 3dfbdbb..3dfbdbb 100644 --- a/testproject/templates/sample.html +++ b/wkhtmltopdf/tests/templates/sample.html diff --git a/wkhtmltopdf/tests.py b/wkhtmltopdf/tests/tests.py index cd0213d..6d8f3ac 100644 --- a/wkhtmltopdf/tests.py +++ b/wkhtmltopdf/tests/tests.py @@ -8,9 +8,9 @@ import sys from django.test import TestCase from django.test.client import RequestFactory -from .subprocess import CalledProcessError -from .utils import override_settings, _options_to_args, wkhtmltopdf -from .views import PDFResponse, PDFTemplateView, PDFTemplateResponse +from wkhtmltopdf.subprocess import CalledProcessError +from wkhtmltopdf.utils import override_settings, _options_to_args, wkhtmltopdf +from wkhtmltopdf.views import PDFResponse, PDFTemplateView, PDFTemplateResponse class TestUtils(TestCase): |