Fix test_threading --Event under new pypy standard lib. [skip appveyor]

src/greentest/2.7pypy/lock_tests.py

@@ -39,8 +39,12 @@ class Bunch(object):
                 self.finished.append(tid)
                 while not self._can_exit:
                     _wait()
-        for i in range(n):
-            start_new_thread(task, ())
+        try:
+            for i in range(n):
+                start_new_thread(task, ())
+        except:
+            self._can_exit = True
+            raise
 
     def wait_for_started(self):
         while len(self.started) < self.n:
@@ -301,6 +305,16 @@ class EventTests(BaseTestCase):
         for r, dt in results2:
             self.assertTrue(r)
 
+    def test_reset_internal_locks(self):
+        evt = self.eventtype()
+        if not hasattr(evt, '_Event__cond') or sys.version_info[:3] <= (2, 7, 8):
+            self.skipTest("gevent: internal impl difference")
+        old_lock = evt._Event__cond._Condition__lock
+        evt._reset_internal_locks()
+        new_lock = evt._Event__cond._Condition__lock
+        self.assertIsNot(new_lock, old_lock)
+        self.assertIs(type(new_lock), type(old_lock))
+
 
 class ConditionTests(BaseTestCase):
     """

src/greentest/2.7pypy/test_threading.py

@@ -19,7 +19,7 @@ try:
 except ImportError:
     _testcapi = None
 
-from test import lock_tests
+import lock_tests # gevent: use local copy
 
 # A trivial mutable counter.
 class Counter(object):