[py-svn] commit/pytest: hpk42: - fix test_nose.py by being more tolerant about the error message

[Bitbucket]

1 new commit in pytest:


https://bitbucket.org/hpk42/pytest/changeset/a2b978e586f2/
changeset:   a2b978e586f2
user:        hpk42
date:        2012-10-22 10:55:59
summary:     - 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
affected #:  3 files

diff -r 40c73a4d102182bf1fa9f1d4f4316fe7a1338c2f -r a2b978e586f2e09a90106ccdabf5860f15b6b928 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - 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 -r 40c73a4d102182bf1fa9f1d4f4316fe7a1338c2f -r a2b978e586f2e09a90106ccdabf5860f15b6b928 testing/test_nose.py
--- a/testing/test_nose.py
+++ b/testing/test_nose.py
@@ -85,7 +85,7 @@
     """)
     result = testdir.runpytest(p, '-p', 'nose')
     result.stdout.fnmatch_lines([
-        "*TypeError: <lambda>() takes exactly 1*0 given*"
+        "*TypeError: <lambda>()*"
     ])
 
 


diff -r 40c73a4d102182bf1fa9f1d4f4316fe7a1338c2f -r a2b978e586f2e09a90106ccdabf5860f15b6b928 tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 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 @@
 
 [testenv:py33]
 deps=py>=1.4.0
+     nose
 
 [testenv:jython]
 changedir=testing

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.