[pypy-commit] stmgc default: fix some tests

[Raemi]

Author: Remi Meier <remi.meier at inf.ethz.ch>
Branch: 
Changeset: r1360:6bb0732c0c48
Date: 2014-09-05 15:18 +0200
http://bitbucket.org/pypy/stmgc/changeset/6bb0732c0c48/

Log:	fix some tests

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
@@ -317,8 +317,9 @@
         self.start_transaction()
         stm_write(lp1)
         stm_set_char(lp1, 'b')
-        # transaction from thread 1 is newer than from thread 0
-        py.test.raises(Conflict, self.commit_transaction)
+        self.commit_transaction()
+
+        py.test.raises(Conflict, self.switch, 0) # fails validation
 
     def test_resolve_write_read_conflict(self):
         self.start_transaction()
@@ -352,7 +353,11 @@
         #
         self.switch(1)
         self.start_transaction()
-        py.test.raises(Conflict, stm_write, lp1) # write-write conflict
+        stm_write(lp1)
+        self.switch(0)
+        self.commit_transaction()
+
+        py.test.raises(Conflict, self.switch, 1) # write-write conflict
 
     def test_abort_cleanup(self):
         self.start_transaction()