Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r76503:1f0c0b00b785
Date: 2015-03-22 17:39 +0100
http://bitbucket.org/pypy/pypy/changeset/1f0c0b00b785/
Log: merge heads
diff --git a/pypy/module/pypystm/test_pypy_c/test_no_conflict.py
b/pypy/module/pypystm/test_pypy_c/test_no_conflict.py
--- a/pypy/module/pypystm/test_pypy_c/test_no_conflict.py
+++ b/pypy/module/pypystm/test_pypy_c/test_no_conflict.py
@@ -68,7 +68,6 @@
self.check_almost_no_conflict(f)
def test_weakrefs(self):
- py.test.skip("next issue")
def f():
import weakref
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
