1 new changeset in pytest:
http://bitbucket.org/hpk42/pytest/changeset/98eb11d8887b/
changeset: r2133:98eb11d8887b
user: hpk
date: 2011-01-11 17:27:34
summary: fix issue15 - tests for python3/nose-1.0 combo work now
affected #: 5 files (270 bytes)
--- a/CHANGELOG Tue Jan 11 15:54:47 2011 +0100
+++ b/CHANGELOG Tue Jan 11 17:27:34 2011 +0100
@@ -1,6 +1,8 @@
Changes between 2.0.0 and 2.0.1.devX
----------------------------------------------
+- fix issue15: make nose compatibility tests compatible
+ with python3 (now that nose-1.0 supports python3)
- remove somewhat surprising "same-conftest" detection because
it ignores conftest.py when they appear in several subdirs.
- improve assertions ("not in"), thanks Floris
--- a/pytest.py Tue Jan 11 15:54:47 2011 +0100
+++ b/pytest.py Tue Jan 11 17:27:34 2011 +0100
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.1.dev5'
+__version__ = '2.0.1.dev6'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins
--- a/setup.py Tue Jan 11 15:54:47 2011 +0100
+++ b/setup.py Tue Jan 11 17:27:34 2011 +0100
@@ -22,7 +22,7 @@
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.0.1.dev5',
+ version='2.0.1.dev6',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
--- a/testing/test_nose.py Tue Jan 11 15:54:47 2011 +0100
+++ b/testing/test_nose.py Tue Jan 11 17:27:34 2011 +0100
@@ -6,7 +6,9 @@
def test_nose_setup(testdir):
p = testdir.makepyfile("""
l = []
+ from nose.tools import with_setup
+ @with_setup(lambda: l.append(1), lambda: l.append(2))
def test_hello():
assert l == [1]
@@ -24,6 +26,8 @@
def test_nose_setup_func(testdir):
p = testdir.makepyfile("""
+ from nose.tools import with_setup
+
l = []
def my_setup():
@@ -34,16 +38,15 @@
b = 2
l.append(b)
+ @with_setup(my_setup, my_teardown)
def test_hello():
- print l
+ print (l)
assert l == [1]
def test_world():
- print l
+ print (l)
assert l == [1,2]
- test_hello.setup = my_setup
- test_hello.teardown = my_teardown
""")
result = testdir.runpytest(p, '-p', 'nose')
result.stdout.fnmatch_lines([
@@ -53,25 +56,25 @@
def test_nose_setup_func_failure(testdir):
p = testdir.makepyfile("""
+ from nose.tools import with_setup
+
l = []
-
my_setup = lambda x: 1
my_teardown = lambda x: 2
+ @with_setup(my_setup, my_teardown)
def test_hello():
- print l
+ print (l)
assert l == [1]
def test_world():
- print l
+ print (l)
assert l == [1,2]
- test_hello.setup = my_setup
- test_hello.teardown = my_teardown
""")
result = testdir.runpytest(p, '-p', 'nose')
result.stdout.fnmatch_lines([
- "*TypeError: <lambda>() takes exactly 1 argument (0 given)*"
+ "*TypeError: <lambda>() takes exactly 1*0 given*"
])
@@ -83,11 +86,11 @@
my_teardown = 2
def test_hello():
- print l
+ print (l)
assert l == [1]
def test_world():
- print l
+ print (l)
assert l == [1,2]
test_hello.setup = my_setup
@@ -118,11 +121,11 @@
my_teardown_partial = partial(my_teardown, 2)
def test_hello():
- print l
+ print (l)
assert l == [1]
def test_world():
- print l
+ print (l)
assert l == [1,2]
test_hello.setup = my_setup_partial
@@ -173,21 +176,21 @@
class TestClass(object):
def setup(self):
- print "setup called in", self
+ print ("setup called in %s" % self)
self.called = ['setup']
def teardown(self):
- print "teardown called in", self
+ print ("teardown called in %s" % self)
eq_(self.called, ['setup'])
self.called.append('teardown')
def test(self):
- print "test called in", self
+ print ("test called in %s" % self)
for i in range(0, 5):
yield self.check, i
def check(self, i):
- print "check called in", self
+ print ("check called in %s" % self)
expect = ['setup']
#for x in range(0, i):
# expect.append('setup')
--- a/tox.ini Tue Jan 11 15:54:47 2011 +0100
+++ b/tox.ini Tue Jan 11 17:27:34 2011 +0100
@@ -49,6 +49,7 @@
[testenv:py31]
deps=py>=1.4.0
+ nose>=1.0
[testenv:py31-xdist]
deps=pytest-xdist
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.
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
