Permalink
Browse files

Merge branch 'local-test-settings' of https://github.com/rdegges/open…

…comparison into rdegges-local-test-settings
  • Loading branch information...
2 parents 768af21 + 8a60955 commit 65fa63e8475eb198c51e162da0b35ef04072fd7f @pydanny pydanny committed May 13, 2012
Showing with 44 additions and 36 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 CONTRIBUTORS.txt
  3. +1 −1 docs/contributing.rst
  4. +2 −2 docs/testing_instructions.rst
  5. +0 −12 settings/base.py
  6. +39 −0 settings/test.py
  7. +0 −19 settings/travis.py
View
@@ -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
View
@@ -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.
View
@@ -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**.
@@ -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
View
@@ -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",
View
@@ -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": "",
+ },
+}
View
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-"""TravisCI settings which allow us to run our test suite on the TravisCI
-continuous integration service.
-"""
-
-
-from settings.base import *
-
-
-DATABASES = {
- "default": {
- "ENGINE": "django.db.backends.sqlite3",
- "NAME": ":memory:",
- "USER": "",
- "PASSWORD": "",
- "HOST": "",
- "PORT": "",
- },
-}

0 comments on commit 65fa63e

Please sign in to comment.