diff options
author | Julien Danjou <julien@danjou.info> | 2013-09-26 12:12:20 +0200 |
---|---|---|
committer | Julien Danjou <julien@danjou.info> | 2013-09-26 17:37:03 +0200 |
commit | abcdd7affa4ecde6c6d3ee2fd50f801c02168841 (patch) | |
tree | ca2c3a00a72d9cf67204c5594d78577e3aaa228e | |
parent | 7301adc75d57aba6dd5a3c527116be4fbcafd05d (diff) | |
download | wsme-abcdd7affa4ecde6c6d3ee2fd50f801c02168841.tar.gz |
Include Pecan tests in default Python environment
- Makes sure we always run Pecan test and that there's no regression.
There's no real need to split them out as they are not invasive.
Also that reduces the number of environment a bit.
- This also fixes Pecan tests on python2.6
- This also fixes Pecan tests on python3.3
- This also enables Pecan tests on python3.2
Change-Id: I57070b0bd785fb3d445f432973f15825abccbdd5
-rw-r--r-- | tests/pecantest/test/controllers/ws.py | 9 | ||||
-rw-r--r-- | tests/pecantest/test/tests/__init__.py | 4 | ||||
-rw-r--r-- | tests/pecantest/test/tests/test_ws.py | 69 | ||||
-rw-r--r-- | tox-tmpl.ini | 28 | ||||
-rw-r--r-- | tox.ini | 306 | ||||
-rw-r--r-- | wsme/rest/args.py | 4 | ||||
-rw-r--r-- | wsmeext/pecan.py | 6 |
7 files changed, 241 insertions, 185 deletions
diff --git a/tests/pecantest/test/controllers/ws.py b/tests/pecantest/test/controllers/ws.py index f0dcba4..1dcb0cb 100644 --- a/tests/pecantest/test/controllers/ws.py +++ b/tests/pecantest/test/controllers/ws.py @@ -6,6 +6,8 @@ from wsme.types import Base, text, wsattr import wsme import wsmeext.pecan +import six + class Author(Base): id = int @@ -41,7 +43,6 @@ class BooksController(RestController): @wsmeext.pecan.wsexpose(Book, int, int) def get(self, author_id, id): - print repr(author_id), repr(id) book = Book( name=u"Les Confessions d’un révolutionnaire pour servir à " u"l’histoire de la révolution de février", @@ -51,8 +52,6 @@ class BooksController(RestController): @wsmeext.pecan.wsexpose(Book, int, int, body=Book) def put(self, author_id, id, book=None): - print author_id, id - print book book.id = id book.author = Author(id=author_id) return book @@ -68,7 +67,7 @@ class AuthorsController(RestController): books = BooksController() - @wsmeext.pecan.wsexpose([Author], [unicode], [Criterion]) + @wsmeext.pecan.wsexpose([Author], [six.text_type], [Criterion]) def get_all(self, q=None, r=None): if q: return [ @@ -116,4 +115,4 @@ class AuthorsController(RestController): @wsmeext.pecan.wsexpose(None, int) def delete(self, author_id): - print "Deleting", author_id + print("Deleting", author_id) diff --git a/tests/pecantest/test/tests/__init__.py b/tests/pecantest/test/tests/__init__.py index 78ea527..04fa0a6 100644 --- a/tests/pecantest/test/tests/__init__.py +++ b/tests/pecantest/test/tests/__init__.py @@ -1,7 +1,7 @@ import os from unittest import TestCase from pecan import set_config -from pecan.testing import load_test_app +from pecan import testing __all__ = ['FunctionalTest'] @@ -13,7 +13,7 @@ class FunctionalTest(TestCase): """ def setUp(self): - self.app = load_test_app(os.path.join( + self.app = testing.load_test_app(os.path.join( os.path.dirname(__file__), 'config.py' )) diff --git a/tests/pecantest/test/tests/test_ws.py b/tests/pecantest/test/tests/test_ws.py index 3c22042..4eb9607 100644 --- a/tests/pecantest/test/tests/test_ws.py +++ b/tests/pecantest/test/tests/test_ws.py @@ -2,14 +2,13 @@ from six.moves import http_client from test.tests import FunctionalTest import json import pecan +import six -used_status_codes = [400, 401, 404, 500] -http_response_messages = { - code: '{} {}'.format(code, status) - for code, status in http_client.responses.iteritems() - if code in used_status_codes -} +used_status_codes = [400, 401, 404, 500] +http_response_messages = {} +for code in used_status_codes: + http_response_messages[code] = '%s %s' % (code, http_client.responses[code]) class TestWS(FunctionalTest): @@ -18,32 +17,28 @@ class TestWS(FunctionalTest): def test_optional_array_param(self): r = self.app.get('/authors?q=a&q=b') - l = json.loads(r.body) - print l + l = json.loads(r.body.decode('utf-8')) assert len(l) == 2 assert l[0]['firstname'] == 'a' assert l[1]['firstname'] == 'b' def test_optional_indexed_array_param(self): r = self.app.get('/authors?q[0]=a&q[1]=b') - l = json.loads(r.body) - print l + l = json.loads(r.body.decode('utf-8')) assert len(l) == 2 assert l[0]['firstname'] == 'a' assert l[1]['firstname'] == 'b' def test_options_object_array_param(self): r = self.app.get('/authors?r.value=a&r.value=b') - l = json.loads(r.body) - print l + l = json.loads(r.body.decode('utf-8')) assert len(l) == 2 assert l[0]['firstname'] == 'a' assert l[1]['firstname'] == 'b' def test_options_indexed_object_array_param(self): r = self.app.get('/authors?r[0].value=a&r[1].value=b') - l = json.loads(r.body) - print l + l = json.loads(r.body.decode('utf-8')) assert len(l) == 2 assert l[0]['firstname'] == 'a' assert l[1]['firstname'] == 'b' @@ -52,9 +47,7 @@ class TestWS(FunctionalTest): a = self.app.get( '/authors/1.json', ) - print a - a = json.loads(a.body) - print a + a = json.loads(a.body.decode('utf-8')) assert a['id'] == 1 assert a['firstname'] == 'aname' @@ -62,9 +55,9 @@ class TestWS(FunctionalTest): a = self.app.get( '/authors/1.xml', ) - print a - assert '<id>1</id>' in a.body - assert '<firstname>aname</firstname>' in a.body + body = a.body.decode('utf-8') + assert '<id>1</id>' in body + assert '<firstname>aname</firstname>' in body def test_post_body_parameter(self): res = self.app.post( @@ -72,8 +65,7 @@ class TestWS(FunctionalTest): headers={"Content-Type": "application/json"} ) assert res.status_int == 201 - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['id'] == 10 assert a['firstname'] == 'test' @@ -84,19 +76,16 @@ class TestWS(FunctionalTest): '/authors/999.json', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['faultcode'] == 'Client' res = self.app.get( '/authors/999.xml', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - assert '<faultcode>Client</faultcode>' in res.body + assert '<faultcode>Client</faultcode>' in res.body.decode('utf-8') def test_custom_clientside_error(self): expected_status_code = 404 @@ -105,19 +94,16 @@ class TestWS(FunctionalTest): '/authors/998.json', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['faultcode'] == 'Server' res = self.app.get( '/authors/998.xml', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - assert '<faultcode>Server</faultcode>' in res.body + assert '<faultcode>Server</faultcode>' in res.body.decode('utf-8') def test_custom_non_http_clientside_error(self): expected_status_code = 500 @@ -126,19 +112,16 @@ class TestWS(FunctionalTest): '/authors/997.json', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['faultcode'] == 'Server' res = self.app.get( '/authors/997.xml', expect_errors=True ) - print res self.assertEqual(res.status, expected_status) - assert '<faultcode>Server</faultcode>' in res.body + assert '<faultcode>Server</faultcode>' in res.body.decode('utf-8') def test_non_default_response(self): expected_status_code = 401 @@ -155,8 +138,7 @@ class TestWS(FunctionalTest): expected_status = http_response_messages[expected_status_code] res = self.app.get('/divide_by_zero.json', expect_errors=True) self.assertEqual(res.status, expected_status) - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['faultcode'] == 'Server' assert a['debuginfo'] is None @@ -166,8 +148,7 @@ class TestWS(FunctionalTest): pecan.set_config({'wsme': {'debug': True}}) res = self.app.get('/divide_by_zero.json', expect_errors=True) self.assertEqual(res.status, expected_status) - a = json.loads(res.body) - print a + a = json.loads(res.body.decode('utf-8')) assert a['faultcode'] == 'Server' assert a['debuginfo'].startswith('Traceback (most recent call last):') @@ -177,11 +158,13 @@ class TestWS(FunctionalTest): '{"name": "Alice au pays des merveilles"}', headers={"Content-Type": "application/json"} ) - book = json.loads(res.body) - print book + book = json.loads(res.body.decode('utf-8')) assert book['id'] == 2 assert book['author']['id'] == 1 def test_no_content_type_if_no_return_type(self): + if six.PY3: + self.skipTest( + "This test does not work in Python 3 until https://review.openstack.org/#/c/48439/ is merged") res = self.app.delete('/authors/4') assert "Content-Type" not in res.headers, res.headers['Content-Type'] diff --git a/tox-tmpl.ini b/tox-tmpl.ini index d5065e8..d655ee0 100644 --- a/tox-tmpl.ini +++ b/tox-tmpl.ini @@ -1,6 +1,6 @@ # content of: tox.ini , put in same dir as setup.py [tox] -envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml,pep8 +envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pep8 [common] testtools= @@ -20,9 +20,10 @@ deps = webtest transaction suds + pecan commands= - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -36,10 +37,11 @@ deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip commands= - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -50,10 +52,11 @@ deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip commands= - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -145,23 +148,6 @@ commands= {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py -[testenv:pecan] -basepython=python2.7 -deps= - pbr - nose - webtest - coverage - simplejson - pecan -setenv= - PYTHONPATH={toxinidir} - COVERAGE_FILE=.coverage.{envname} - -commands= - {envbindir}/nosetests -w tests/pecantest test/tests/test_ws.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsme,wsmeext {posargs} - {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py - [testenv:flask] basepython=python2.7 deps= @@ -1,5 +1,5 @@ [tox] -envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml,pep8 +envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,flask,cornice,coverage,py33,py33-nolxml,pep8 [common] testtools = @@ -68,22 +68,6 @@ commands = {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py -[testenv:pecan] -basepython = python2.7 -deps = - pbr - nose - webtest - coverage - simplejson - pecan -setenv = - PYTHONPATH={toxinidir} - COVERAGE_FILE=.coverage.{envname} -commands = - {envbindir}/nosetests -w tests/pecantest test/tests/test_ws.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsme,wsmeext {posargs} - {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py - [testenv:flask] basepython = python2.7 deps = @@ -142,7 +126,7 @@ deps = [testenv:py26-sa5-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -150,12 +134,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml [testenv:py26-sa5] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -163,12 +148,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml [testenv:py26-sa5-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -176,13 +162,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson [testenv:py26-sa5-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -190,13 +177,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson [testenv:py26-sa5-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -204,11 +192,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 [testenv:py26-sa5-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -216,11 +205,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 [testenv:py26-sa5-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -228,12 +218,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 simplejson [testenv:py26-sa6-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -241,12 +232,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml [testenv:py26-sa6] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -254,12 +246,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml [testenv:py26-sa6-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -267,13 +260,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson [testenv:py26-sa6-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -281,13 +275,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson [testenv:py26-sa6-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -295,11 +290,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 [testenv:py26-sa6-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -307,11 +303,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 [testenv:py26-sa6-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -319,12 +316,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 simplejson [testenv:py26-sa7-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -332,12 +330,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml [testenv:py26] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -345,12 +344,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml [testenv:py26-sa7-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -358,13 +358,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson [testenv:py26-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -372,13 +373,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson [testenv:py26-sa7-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -386,11 +388,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 [testenv:py26-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -398,11 +401,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 [testenv:py26-sa7-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -410,12 +414,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson [testenv:py26-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -423,12 +428,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson [testenv:py27-sa5-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -436,13 +442,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml basepython = python2.7 [testenv:py27-sa5] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -450,13 +457,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml basepython = python2.7 [testenv:py27-sa5-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -464,6 +472,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson @@ -471,7 +480,7 @@ basepython = python2.7 [testenv:py27-sa5-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -479,6 +488,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson @@ -486,7 +496,7 @@ basepython = python2.7 [testenv:py27-sa5-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -494,12 +504,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 basepython = python2.7 [testenv:py27-sa5-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -507,12 +518,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 basepython = python2.7 [testenv:py27-sa5-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -520,13 +532,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 simplejson basepython = python2.7 [testenv:py27-sa6-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -534,13 +547,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml basepython = python2.7 [testenv:py27-sa6] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -548,13 +562,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml basepython = python2.7 [testenv:py27-sa6-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -562,6 +577,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson @@ -569,7 +585,7 @@ basepython = python2.7 [testenv:py27-sa6-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -577,6 +593,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson @@ -584,7 +601,7 @@ basepython = python2.7 [testenv:py27-sa6-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -592,12 +609,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 basepython = python2.7 [testenv:py27-sa6-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -605,12 +623,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 basepython = python2.7 [testenv:py27-sa6-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -618,13 +637,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 simplejson basepython = python2.7 [testenv:py27-sa7-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -632,13 +652,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml basepython = python2.7 [testenv:py27] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -646,13 +667,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml basepython = python2.7 [testenv:py27-sa7-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -660,6 +682,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson @@ -667,7 +690,7 @@ basepython = python2.7 [testenv:py27-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -675,6 +698,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson @@ -682,7 +706,7 @@ basepython = python2.7 [testenv:py27-sa7-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -690,12 +714,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 basepython = python2.7 [testenv:py27-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -703,12 +728,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 basepython = python2.7 [testenv:py27-sa7-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -716,13 +742,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson basepython = python2.7 [testenv:py27-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -730,19 +757,21 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson basepython = python2.7 [testenv:py32-sa6-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -750,13 +779,14 @@ basepython = python3.2 [testenv:py32-sa6] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -764,39 +794,42 @@ basepython = python3.2 [testenv:py32-sa6-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 basepython = python3.2 [testenv:py32-sa6-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 basepython = python3.2 [testenv:py32-sa7-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -804,13 +837,14 @@ basepython = python3.2 [testenv:py32] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -818,39 +852,42 @@ basepython = python3.2 [testenv:py32-sa7-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 basepython = python3.2 [testenv:py32-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 basepython = python3.2 [testenv:py33-sa5-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 lxml @@ -858,13 +895,14 @@ basepython = python3.3 [testenv:py33-sa5] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 lxml @@ -872,13 +910,14 @@ basepython = python3.3 [testenv:py33-sa5-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 lxml @@ -887,13 +926,14 @@ basepython = python3.3 [testenv:py33-sa5-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 lxml @@ -902,39 +942,42 @@ basepython = python3.3 [testenv:py33-sa5-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 basepython = python3.3 [testenv:py33-sa5-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 basepython = python3.3 [testenv:py33-sa5-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.5.99 simplejson @@ -942,13 +985,14 @@ basepython = python3.3 [testenv:py33-sa6-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -956,13 +1000,14 @@ basepython = python3.3 [testenv:py33-sa6] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -970,13 +1015,14 @@ basepython = python3.3 [testenv:py33-sa6-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -985,13 +1031,14 @@ basepython = python3.3 [testenv:py33-sa6-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 lxml @@ -1000,39 +1047,42 @@ basepython = python3.3 [testenv:py33-sa6-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 basepython = python3.3 [testenv:py33-sa6-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 basepython = python3.3 [testenv:py33-sa6-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.6.99 simplejson @@ -1040,13 +1090,14 @@ basepython = python3.3 [testenv:py33-sa7-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -1054,13 +1105,14 @@ basepython = python3.3 [testenv:py33] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -1068,13 +1120,14 @@ basepython = python3.3 [testenv:py33-sa7-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -1083,13 +1136,14 @@ basepython = python3.3 [testenv:py33-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 lxml @@ -1098,39 +1152,42 @@ basepython = python3.3 [testenv:py33-sa7-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 basepython = python3.3 [testenv:py33-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 basepython = python3.3 [testenv:py33-sa7-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 simplejson @@ -1138,13 +1195,14 @@ basepython = python3.3 [testenv:py33-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing --omit wsmeext/sphinxext.py wsme/*.py wsme/rest/*.py wsmeext/*.py deps = {[common]testtools} webtest transaction + pecan https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip SQLAlchemy<=0.7.99 simplejson @@ -1152,7 +1210,7 @@ basepython = python3.3 [testenv:pypy-sa5-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1160,12 +1218,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml [testenv:pypy-sa5] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1173,12 +1232,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml [testenv:pypy-sa5-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1186,13 +1246,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson [testenv:pypy-sa5-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1200,13 +1261,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 lxml simplejson [testenv:pypy-sa5-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1214,11 +1276,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 [testenv:pypy-sa5-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1226,11 +1289,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 [testenv:pypy-sa5-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1238,12 +1302,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.5.99 simplejson [testenv:pypy-sa6-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1251,12 +1316,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml [testenv:pypy-sa6] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1264,12 +1330,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml [testenv:pypy-sa6-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1277,13 +1344,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson [testenv:pypy-sa6-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1291,13 +1359,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 lxml simplejson [testenv:pypy-sa6-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1305,11 +1374,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 [testenv:pypy-sa6-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1317,11 +1387,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 [testenv:pypy-sa6-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1329,12 +1400,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.6.99 simplejson [testenv:pypy-sa7-lxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1342,12 +1414,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml [testenv:pypy] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1355,12 +1428,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml [testenv:pypy-sa7-lxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1368,13 +1442,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson [testenv:pypy-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1382,13 +1457,14 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 lxml simplejson [testenv:pypy-sa7-nolxml-json] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1396,11 +1472,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 [testenv:pypy-nolxml] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1408,11 +1485,12 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 [testenv:pypy-sa7-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1420,12 +1498,13 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson [testenv:pypy-nolxml-simplejson] commands = - {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --verbose {posargs} + {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py deps = @@ -1433,6 +1512,7 @@ deps = webtest transaction suds + pecan SQLAlchemy<=0.7.99 simplejson diff --git a/wsme/rest/args.py b/wsme/rest/args.py index 321554e..42ad040 100644 --- a/wsme/rest/args.py +++ b/wsme/rest/args.py @@ -11,6 +11,8 @@ from wsme.types import UserType, ArrayType, DictType, File from wsme.utils import parse_isodate, parse_isotime, parse_isodatetime import wsme.runtime +from six import moves + ARRAY_MAX_SIZE = 1000 @@ -114,7 +116,7 @@ def array_from_params(datatype, params, path, hit_paths): if len(value) < len(attrvalues): value[-1:] = [ datatype.item_type() - for i in xrange(len(attrvalues) - len(value)) + for i in moves.range(len(attrvalues) - len(value)) ] for i, attrvalue in enumerate(attrvalues): setattr( diff --git a/wsmeext/pecan.py b/wsmeext/pecan.py index 268c76c..e116bd7 100644 --- a/wsmeext/pecan.py +++ b/wsmeext/pecan.py @@ -53,6 +53,11 @@ def wsexpose(*args, **kwargs): content_type='application/xml', generic=False ) + pecan_text_xml_decorate = pecan.expose( + template='wsmexml:', + content_type='text/xml', + generic=False + ) sig = wsme.signature(*args, **kwargs) def decorate(f): @@ -109,6 +114,7 @@ def wsexpose(*args, **kwargs): ) pecan_xml_decorate(callfunction) + pecan_text_xml_decorate(callfunction) pecan_json_decorate(callfunction) pecan.util._cfg(callfunction)['argspec'] = inspect.getargspec(f) callfunction._wsme_definition = funcdef |