Author: Maciej Fijalkowski <fij...@gmail.com> Branch: Changeset: r44232:9de1975e5281 Date: 2011-05-17 11:59 +0200 http://bitbucket.org/pypy/pypy/changeset/9de1975e5281/
Log: merge heads diff --git a/pypy/jit/metainterp/test/test_resoperation.py b/pypy/jit/metainterp/test/test_resoperation.py --- a/pypy/jit/metainterp/test/test_resoperation.py +++ b/pypy/jit/metainterp/test/test_resoperation.py @@ -72,7 +72,7 @@ def test_get_deep_immutable_oplist(): ops = [rop.ResOperation(rop.rop.INT_ADD, ['a', 'b'], 'c')] newops = rop.get_deep_immutable_oplist(ops) - py.test.raises(AttributeError, "newops.append('foobar')") + py.test.raises(TypeError, "newops.append('foobar')") py.test.raises(TypeError, "newops[0] = 'foobar'") py.test.raises(AssertionError, "newops[0].setarg(0, 'd')") py.test.raises(AssertionError, "newops[0].setdescr('foobar')") _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit