[pypy-commit] stmgc c8-gil-like: Fix test_extra

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: c8-gil-like
Changeset: r1818:db81f0821c99
Date: 2015-06-12 15:52 +0200
http://bitbucket.org/pypy/stmgc/changeset/db81f0821c99/

Log:	Fix test_extra

diff --git a/c8/test/support.py b/c8/test/support.py
--- a/c8/test/support.py
+++ b/c8/test/support.py
@@ -85,7 +85,7 @@
 bool _check_commit_transaction(void);
 bool _check_abort_transaction(void);
 bool _check_become_inevitable(stm_thread_local_t *tl);
-bool _check_become_globally_unique_transaction(stm_thread_local_t *tl);
+//bool _check_become_globally_unique_transaction(stm_thread_local_t *tl);
 bool _check_stop_all_other_threads(void);
 void stm_resume_all_other_threads(void);
 int stm_is_inevitable(void);
@@ -306,10 +306,6 @@
     CHECKED(stm_become_inevitable(tl, "TEST"));
 }
 
-bool _check_become_globally_unique_transaction(stm_thread_local_t *tl) {
-    CHECKED(stm_become_globally_unique_transaction(tl, "TESTGUT"));
-}
-
 bool _check_stop_all_other_threads(void) {
     CHECKED(stm_stop_all_other_threads());
 }
@@ -884,6 +880,7 @@
             raise Conflict()
 
     def become_globally_unique_transaction(self):
+        import py; py.test.skip("this function was removed")
         tl = self.tls[self.current_thread]
         if lib._check_become_globally_unique_transaction(tl):
             raise Conflict()
diff --git a/c8/test/test_extra.py b/c8/test/test_extra.py
--- a/c8/test/test_extra.py
+++ b/c8/test/test_extra.py
@@ -202,6 +202,9 @@
         assert lib.stm_is_inevitable()
         #
         py.test.raises(Conflict, self.switch, 0)
+        #
+        self.switch(1)
+        self.resume_all_other_threads()
 
     def test_stm_stop_all_other_threads_2(self):
         self.start_transaction()