Author: Carl Friedrich Bolz-Tereick <cfb...@gmx.de> Branch: py3.5 Changeset: r94597:c697fd791c27 Date: 2018-05-15 21:58 +0200 http://bitbucket.org/pypy/pypy/changeset/c697fd791c27/
Log: fix more raises/skip imports diff --git a/pypy/objspace/std/test/test_iterobject.py b/pypy/objspace/std/test/test_iterobject.py --- a/pypy/objspace/std/test/test_iterobject.py +++ b/pypy/objspace/std/test/test_iterobject.py @@ -1,3 +1,4 @@ +import pytest from pypy.objspace.std.iterobject import W_SeqIterObject from pypy.interpreter.error import OperationError @@ -11,8 +12,8 @@ self.body0(w_iter) def body0(self, w_iter): - raises(OperationError, self.space.next, w_iter) - raises(OperationError, self.space.next, w_iter) + pytest.raises(OperationError, self.space.next, w_iter) + pytest.raises(OperationError, self.space.next, w_iter) def test_iter(self): w = self.space.wrap diff --git a/pypy/objspace/std/test/test_listobject.py b/pypy/objspace/std/test/test_listobject.py --- a/pypy/objspace/std/test/test_listobject.py +++ b/pypy/objspace/std/test/test_listobject.py @@ -120,8 +120,8 @@ assert self.space.eq_w(self.space.next(w_iter), w(5)) assert self.space.eq_w(self.space.next(w_iter), w(3)) assert self.space.eq_w(self.space.next(w_iter), w(99)) - raises(OperationError, self.space.next, w_iter) - raises(OperationError, self.space.next, w_iter) + py.test.raises(OperationError, self.space.next, w_iter) + py.test.raises(OperationError, self.space.next, w_iter) def test_contains(self): w = self.space.wrap diff --git a/pypy/objspace/std/test/test_setstrategies.py b/pypy/objspace/std/test/test_setstrategies.py --- a/pypy/objspace/std/test/test_setstrategies.py +++ b/pypy/objspace/std/test/test_setstrategies.py @@ -1,3 +1,4 @@ +import pytest from pypy.objspace.std.setobject import W_SetObject from pypy.objspace.std.setobject import ( BytesIteratorImplementation, BytesSetStrategy, EmptySetStrategy, @@ -58,7 +59,7 @@ s1 = W_SetObject(self.space, self.wrapped([1,2,3,4,5])) s2 = W_SetObject(self.space, self.wrapped([4,5, "six", "seven"])) s3 = s1.intersect(s2) - skip("for now intersection with ObjectStrategy always results in another ObjectStrategy") + pytest.skip("for now intersection with ObjectStrategy always results in another ObjectStrategy") assert s3.strategy is self.space.fromcache(IntegerSetStrategy) def test_clear(self): @@ -93,7 +94,7 @@ s1 = W_SetObject(self.space, self.wrapped([1,2,3,4,5])) s1.descr_discard(self.space, self.space.wrap("five")) - skip("currently not supported") + pytest.skip("currently not supported") assert s1.strategy is self.space.fromcache(IntegerSetStrategy) set_discard__Set_ANY(self.space, s1, self.space.wrap(FakeInt(5))) @@ -112,7 +113,7 @@ s1 = W_SetObject(self.space, self.wrapped([1,2,3,4,5])) assert not s1.has_key(self.space.wrap("five")) - skip("currently not supported") + pytest.skip("currently not supported") assert s1.strategy is self.space.fromcache(IntegerSetStrategy) assert s1.has_key(self.space.wrap(FakeInt(2))) diff --git a/pypy/objspace/std/test/test_tupleobject.py b/pypy/objspace/std/test/test_tupleobject.py --- a/pypy/objspace/std/test/test_tupleobject.py +++ b/pypy/objspace/std/test/test_tupleobject.py @@ -1,3 +1,4 @@ +import pytest from pypy.interpreter.error import OperationError from pypy.objspace.std.tupleobject import W_TupleObject @@ -42,8 +43,8 @@ assert self.space.eq_w(self.space.next(w_iter), w(5)) assert self.space.eq_w(self.space.next(w_iter), w(3)) assert self.space.eq_w(self.space.next(w_iter), w(99)) - raises(OperationError, self.space.next, w_iter) - raises(OperationError, self.space.next, w_iter) + pytest.raises(OperationError, self.space.next, w_iter) + pytest.raises(OperationError, self.space.next, w_iter) def test_contains(self): w = self.space.wrap _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit