Author: Manuel Jacob <[email protected]>
Branch:
Changeset: r90512:085da6954f2c
Date: 2017-03-03 17:21 +0100
http://bitbucket.org/pypy/pypy/changeset/085da6954f2c/
Log: Call setup for each test method in this class instead of only once.
Fix wrong test that would fail otherwise because the tests weren't
independent before.
diff --git a/pypy/module/_io/test/test_fileio.py
b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -5,12 +5,12 @@
class AppTestFileIO:
spaceconfig = dict(usemodules=['_io'] + (['fcntl'] if os.name != 'nt' else
[]))
- def setup_class(cls):
+ def setup_method(self, meth):
tmpfile = udir.join('tmpfile')
tmpfile.write("a\nb\nc", mode='wb')
- cls.w_tmpfile = cls.space.wrap(str(tmpfile))
- cls.w_tmpdir = cls.space.wrap(str(udir))
- cls.w_posix = cls.space.appexec([], """():
+ self.w_tmpfile = self.space.wrap(str(tmpfile))
+ self.w_tmpdir = self.space.wrap(str(udir))
+ self.w_posix = self.space.appexec([], """():
import %s as m;
return m""" % os.name)
@@ -135,7 +135,7 @@
import _io
a = bytearray('x' * 10)
f = _io.FileIO(self.tmpfile, 'r+')
- assert f.readinto(a) == 10
+ assert f.readinto(a) == 5
exc = raises(TypeError, f.readinto, u"hello")
assert str(exc.value) == "cannot use unicode as modifiable buffer"
exc = raises(TypeError, f.readinto, buffer(b"hello"))
@@ -145,7 +145,7 @@
exc = raises(TypeError, f.readinto, memoryview(b"hello"))
assert str(exc.value) == "must be read-write buffer, not memoryview"
f.close()
- assert a == 'a\nb\nc\0\0\0\0\0'
+ assert a == 'a\nb\ncxxxxx'
#
a = bytearray('x' * 10)
f = _io.FileIO(self.tmpfile, 'r+')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
