Author: Armin Rigo <[email protected]>
Branch: c7-more-segments
Changeset: r1035:6587c5783a11
Date: 2014-03-16 11:00 +0100
http://bitbucket.org/pypy/stmgc/changeset/6587c5783a11/
Log: hg merge default
diff --git a/c7/test/support.py b/c7/test/support.py
--- a/c7/test/support.py
+++ b/c7/test/support.py
@@ -411,7 +411,10 @@
if lib._stm_in_transaction(tl):
if self.current_thread != n:
self.switch(n)
- self.abort_transaction()
+ if lib.stm_is_inevitable():
+ self.commit_transaction() # must succeed!
+ else:
+ self.abort_transaction()
for tl in self.tls:
lib.stm_unregister_thread_local(tl)
lib.stm_teardown()
diff --git a/c7/test/test_weakref.py b/c7/test/test_weakref.py
--- a/c7/test/test_weakref.py
+++ b/c7/test/test_weakref.py
@@ -146,6 +146,7 @@
class TestIsolation(BaseTest):
def test_not_break(self):
+ py.test.xfail("known to fail")
lpold = stm_allocate_old_refs(1)
self.start_transaction()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
