aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-03-19 03:04:22 +0100
committermarkotibold2011-03-19 03:04:22 +0100
commit921519732728633517769eaa4a999f08100ce77d (patch)
tree79af036cea766e131ba37415d0f250077e9af945
parentfabf7c255d33f3b187a7e40f3c94ac9cb8c3e5e2 (diff)
downloaddjango-rest-framework-921519732728633517769eaa4a999f08100ce77d.tar.bz2
Adding examples to tox. Appears quite useful cause some example tests are broken.
-rw-r--r--examples/runtests.py27
-rw-r--r--examples/settings.py5
-rw-r--r--tox.ini103
3 files changed, 133 insertions, 2 deletions
diff --git a/examples/runtests.py b/examples/runtests.py
new file mode 100644
index 00000000..fd79bc64
--- /dev/null
+++ b/examples/runtests.py
@@ -0,0 +1,27 @@
+import os
+import sys
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+from django.conf import settings
+from django.test.utils import get_runner
+
+def main():
+ TestRunner = get_runner(settings)
+
+ if hasattr(TestRunner, 'func_name'):
+ # Pre 1.2 test runners were just functions,
+ # and did not support the 'failfast' option.
+ import warnings
+ warnings.warn(
+ 'Function-based test runners are deprecated. Test runners should be classes with a run_tests() method.',
+ DeprecationWarning
+ )
+ failures = TestRunner(None)
+ else:
+ test_runner = TestRunner()
+ failures = test_runner.run_tests(None)
+
+ sys.exit(failures)
+
+if __name__ == '__main__':
+ main()
diff --git a/examples/settings.py b/examples/settings.py
index c4cdd992..d38ab425 100644
--- a/examples/settings.py
+++ b/examples/settings.py
@@ -105,3 +105,8 @@ INSTALLED_APPS = (
'pygments_api',
'blogpost',
)
+
+TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
+TEST_OUTPUT_VERBOSE = True
+TEST_OUTPUT_DESCRIPTIONS = True
+TEST_OUTPUT_DIR = 'xmlrunner' \ No newline at end of file
diff --git a/tox.ini b/tox.ini
index a58c3980..3b7b22b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,23 @@
+#This file is very NON-DRY because tox currently doesn't yet support interpolation like configparser does.
+#There's ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0
+
[tox]
envlist=
- py25-django12, py26-django12, py27-django12, py25-django13, py26-django13, py27-django13
+ py25-django12,
+ py26-django12,
+ py27-django12,
+ py25-django13,
+ py26-django13,
+ py27-django13,
+
+ py25-django12-examples,
+ py26-django12-examples,
+ py27-django12-examples,
+ py25-django13-examples,
+ py26-django13-examples,
+ py27-django13-examples
+
+########################################### CORE TESTS ############################################
[testenv]
commands=
@@ -8,7 +25,7 @@ commands=
[testenv:py25-django12]
basepython=python2.5
-deps=
+deps+=
django==1.2.4
simplejson
coverage==3.4
@@ -49,3 +66,85 @@ deps=
http://www.djangoproject.com/download/1.3-rc-1/tarball/
coverage==3.4
https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+####################################### EXAMPLES ################################################
+
+[testenv:py25-django12-examples]
+basepython=python2.5
+commands=
+ python examples/runtests.py
+deps=
+ django==1.2.4
+ simplejson
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+[testenv:py26-django12-examples]
+basepython=python2.6
+commands=
+ python examples/runtests.py
+deps=
+ django==1.2.4
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+[testenv:py27-django12-examples]
+basepython=python2.7
+commands=
+ python examples/runtests.py
+deps=
+ django==1.2.4
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+[testenv:py25-django13-examples]
+basepython=python2.5
+commands=
+ python examples/runtests.py
+deps=
+ http://www.djangoproject.com/download/1.3-rc-1/tarball/
+ simplejson
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+[testenv:py26-django13-examples]
+basepython=python2.6
+commands=
+ python examples/runtests.py
+deps=
+ http://www.djangoproject.com/download/1.3-rc-1/tarball/
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+
+[testenv:py27-django13-examples]
+basepython=python2.7
+commands=
+ python examples/runtests.py
+deps=
+ http://www.djangoproject.com/download/1.3-rc-1/tarball/
+ coverage==3.4
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip \ No newline at end of file