Skip to content

Commit

Permalink
Merge branch 'local-test-settings' of https://github.com/rdegges/open…
Browse files Browse the repository at this point in the history
…comparison into rdegges-local-test-settings
  • Loading branch information
pydanny committed May 13, 2012
2 parents 768af21 + 8a60955 commit 65fa63e
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,4 +5,4 @@ python:
install:
- pip install -r requirements/project.txt
script:
- python manage.py test --settings=settings.travis
- python manage.py test --settings=settings.test
2 changes: 1 addition & 1 deletion CONTRIBUTORS.txt
Expand Up @@ -83,4 +83,4 @@ Direct Contributors
Other Contributors
==================

* The entire Python community for providing us the tools we needed to build this thing.
* The entire Python community for providing us the tools we needed to build this thing.
2 changes: 1 addition & 1 deletion docs/contributing.rst
Expand Up @@ -117,7 +117,7 @@ Run the tests!

Before you submit a pull request, please run the entire OpenComparison test suite via::

python manage.py test --settings=settings.base
python manage.py test --settings=settings.test

The first thing the core committers will do is run this command. Any pull request that fails this test suite will be **rejected**.

Expand Down
4 changes: 2 additions & 2 deletions docs/testing_instructions.rst
Expand Up @@ -8,8 +8,8 @@ Running the test suite

To run all of the Packaginator tests::

python manage.py test --settings.base
python manage.py test --settings.test

To run tests for a particular Packaginator app, for example the feeds app::

python manage.py test feeds --settings.base
python manage.py test feeds --settings.test
12 changes: 0 additions & 12 deletions settings/base.py
Expand Up @@ -200,18 +200,6 @@
'django.template.loaders.app_directories.Loader',
)

#TEST_RUNNER = 'testrunner.OurTestRunner'
TEST_RUNNER = 'testrunner.OurCoverageRunner'

COVERAGE_MODULE_EXCLUDES = [
'tests$', 'settings$', 'urls$', 'locale$',
'migrations', 'fixtures', 'big_email_send$',
'load_dev_data$', 'fix_grid_element$',
'package_updater$', 'searchv2_build$'
]
COVERAGE_MODULE_EXCLUDES += PREREQ_APPS + ["djkombu", ]
COVERAGE_REPORT_HTML_OUTPUT_DIR = "coverage"

PACKAGINATOR_HELP_TEXT = {
"REPO_URL": "Enter your project repo hosting URL here.<br />Example: https://github.com/opencomparison/opencomparison",
"PYPI_URL": "<strong>Leave this blank if this package does not have a PyPI release.</strong><br />What PyPI uses to index your package. <br />Example: django-uni-form",
Expand Down
39 changes: 39 additions & 0 deletions settings/test.py
@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
"""Local test settings and globals which allows us to run our test suite
locally.
"""


from settings.base import *


########## DEBUG
DEBUG = True
TEMPLATE_DEBUG = DEBUG
SERVE_MEDIA = DEBUG


########## TEST
TEST_RUNNER = 'testrunner.OurCoverageRunner'

COVERAGE_MODULE_EXCLUDES = [
'tests$', 'settings$', 'urls$', 'locale$',
'migrations', 'fixtures', 'big_email_send$',
'load_dev_data$', 'fix_grid_element$',
'package_updater$', 'searchv2_build$'
]
COVERAGE_MODULE_EXCLUDES += PREREQ_APPS + ["djkombu", ]
COVERAGE_REPORT_HTML_OUTPUT_DIR = "coverage"


########## DATABASES
DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": ":memory:",
"USER": "",
"PASSWORD": "",
"HOST": "",
"PORT": "",
},
}
19 changes: 0 additions & 19 deletions settings/travis.py

This file was deleted.

0 comments on commit 65fa63e

Please sign in to comment.