From 1b61fbc8edb7eac55f2e7d31570eb4c85e6cb055 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 22 Oct 2012 10:55:59 +0200 Subject: [PATCH] - fix test_nose.py by being more tolerant about the error message (differs between py32 and py33, thanks Arfrever) - use pypi again now that py is released --- CHANGELOG | 2 ++ testing/test_nose.py | 2 +- tox.ini | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1b82a7d06..7701d5146 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,8 @@ Changes between 2.3.1 and 2.3.2.dev - fix issue205 - conftests in subdirs customizing pytest_pycollect_makemodule now work properly +- fix exception message check of test_nose.py to pass on python33 as well + - add tox.ini to pytest distribution so that ignore-dirs and others config bits are properly distributed for maintainers who run pytest-own tests diff --git a/testing/test_nose.py b/testing/test_nose.py index 4a2d1b105..933b350ab 100644 --- a/testing/test_nose.py +++ b/testing/test_nose.py @@ -85,7 +85,7 @@ def test_nose_setup_func_failure(testdir): """) result = testdir.runpytest(p, '-p', 'nose') result.stdout.fnmatch_lines([ - "*TypeError: () takes exactly 1*0 given*" + "*TypeError: ()*" ]) diff --git a/tox.ini b/tox.ini index b62f466da..9c9fdb8a9 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist=py26,py27,py31,py32,py33,py27-xdist,py25,trial indexserver= pypi = http://pypi.python.org/simple testrun = http://pypi.testrun.org - default = http://pypi.testrun.org + #default = http://pypi.testrun.org [testenv] changedir=testing @@ -74,6 +74,7 @@ deps=py>=1.4.0 [testenv:py33] deps=py>=1.4.0 + nose [testenv:jython] changedir=testing