- 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

@@ -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
 

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: <lambda>() takes exactly 1*0 given*"
+        "*TypeError: <lambda>()*"
     ])
 
 

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