Changeset 391 for python/trunk/Lib/test/lock_tests.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/lock_tests.py (modified) (2 diffs)

python/trunk/Lib/test/lock_tests.py

@@ -258 +258 @@
         results2 = []
         def f():
-            evt.wait()
-            results1.append(evt.is_set())
-            evt.wait()
-            results2.append(evt.is_set())
+            results1.append(evt.wait())
+            results2.append(evt.wait())
         b = Bunch(f, N)
         b.wait_for_started()
@@ -285 +283 @@
         N = 5
         def f():
-            evt.wait(0.0)
-            results1.append(evt.is_set())
+            results1.append(evt.wait(0.0))
             t1 = time.time()
-            evt.wait(0.2)
-            r = evt.is_set()
+            r = evt.wait(0.2)
             t2 = time.time()
             results2.append((r, t2 - t1))