Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r80361:001457fc6b64
Date: 2015-10-20 21:06 +0100
http://bitbucket.org/pypy/pypy/changeset/001457fc6b64/
Log: backout 65422948292c now that the buildbot reports xpasses correctly
diff --git a/rpython/rlib/test/test_rweakkeydict.py
b/rpython/rlib/test/test_rweakkeydict.py
--- a/rpython/rlib/test/test_rweakkeydict.py
+++ b/rpython/rlib/test/test_rweakkeydict.py
@@ -121,6 +121,8 @@
f(1)
interpret(f, [1])
[email protected](
+ reason="may fail with AssertionError, depending on annotation order")
def test_rpython_merge_RWeakKeyDictionary3():
def g(x):
if x:
@@ -129,10 +131,11 @@
d = RWeakKeyDictionary(KY, VX)
d.set(KX(), VX())
- # may fail with AssertionError, depending on annotation order
- with py.test.raises((UnionError, AssertionError)):
+ with py.test.raises(UnionError):
interpret(g, [1])
[email protected](
+ reason="may fail with AssertionError, depending on annotation order")
def test_rpython_merge_RWeakKeyDictionary4():
def g(x):
if x:
@@ -141,8 +144,7 @@
d = RWeakKeyDictionary(KX, VY)
d.set(KX(), VX())
- # may fail with AssertionError, depending on annotation order
- with py.test.raises((UnionError, AssertionError)):
+ with py.test.raises(UnionError):
interpret(g, [1])
@py.test.mark.xfail(reason="not implemented, messy")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
