Author: Remi Meier <[email protected]>
Branch:
Changeset: r1638:b13bd550b525
Date: 2015-02-19 10:18 +0100
http://bitbucket.org/pypy/stmgc/changeset/b13bd550b525/
Log: test cleanup
diff --git a/c8/test/test_basic.py b/c8/test/test_basic.py
--- a/c8/test/test_basic.py
+++ b/c8/test/test_basic.py
@@ -734,38 +734,6 @@
self.abort_transaction()
assert self.get_stm_thread_local().last_abort__bytes_in_nursery == 0
- def test_abort_in_segfault_handler(self):
- py.test.skip("not doing that anymore")
- lp1 = stm_allocate_old(16)
- lp2 = stm_allocate_old(16)
-
- self.start_transaction()
- stm_set_char(lp1, 'A')
- stm_set_char(lp2, 'B')
- self.commit_transaction()
- # lp1 = S|N|N|N
- # lp2 = S|N|N|N
-
- self.switch(1)
-
- self.start_transaction()
- assert stm_get_char(lp1) == 'A'
- # lp1 = S|P|N|N
- # lp2 = S|N|N|N
-
- self.switch(0)
-
- self.start_transaction()
- stm_set_char(lp1, 'C')
- self.commit_transaction()
- # lp1 = S|P|N|N
- # lp2 = S|N|N|N
-
- self.switch(1, validate=False)
-
- # seg1 segfaults, validates, and aborts:
- py.test.raises(Conflict, stm_get_char, lp2)
-
def test_bug(self):
lp_char_5 = stm_allocate_old(384)
diff --git a/c8/test/test_nursery.py b/c8/test/test_nursery.py
--- a/c8/test/test_nursery.py
+++ b/c8/test/test_nursery.py
@@ -82,7 +82,6 @@
assert young
def test_larger_than_limit_for_nursery_die(self):
- py.test.xfail()
obj_size = lib._STM_FAST_ALLOC + 16
self.start_transaction()
@@ -202,7 +201,6 @@
assert lib.stm_can_move(old) == 0
def test_marker_1(self):
- py.test.xfail()
self.start_transaction()
p1 = stm_allocate(600)
stm_set_char(p1, 'o')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
